abg-writer.cc: Clean up new line emission.

diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index ce0bae2d..8e2c4df1 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1229,7 +1229,7 @@  annotate(const function_decl::parameter_sptr&	parm,
 	<< xml::escape_xml_comment(get_pretty_representation(parm->get_type()));
     }
 
-  o << "' -->\n" ;
+  o << "' -->\n";
 
   return true;
 }
@@ -1959,23 +1959,19 @@  write_decl_in_scope(const decl_base_sptr&	decl,
   stack<string> closing_tags;
   stack<unsigned> closing_indents;
   unsigned indent = initial_indent;
-  bool wrote_context = false;
   for (list<scope_decl*>::const_iterator i = scopes.begin();
        i != scopes.end();
        ++i)
     {
       ABG_ASSERT(!is_global_scope(*i));
 
-      if (i != scopes.begin())
-	o << "\n";
-
       // A type scope is either a namespace ...
       if (namespace_decl* n = is_namespace(*i))
 	{
 	  do_indent(o, indent);
 	  o << "<namespace-decl name='"
 	    << xml::escape_xml_string(n->get_name())
-	    << "'>";
+	    << "'>\n";
 	  closing_tags.push("</namespace-decl>");
 	  closing_indents.push(indent);
 	}
@@ -2012,19 +2008,14 @@  write_decl_in_scope(const decl_base_sptr&	decl,
 	// We should never reach this point.
 	abort();
       indent += c.get_xml_element_indent();
-      wrote_context = true;
     }
 
-  if (wrote_context)
-    o << "\n";
-
   write_decl(decl, ctxt, indent);
 
   while (!closing_tags.empty())
     {
-      o << "\n";
       do_indent(o, closing_indents.top());
-      o << closing_tags.top();
+      o << closing_tags.top() << "\n";
       closing_tags.pop();
       closing_indents.pop();
     }
@@ -2201,14 +2192,12 @@  write_canonical_types_of_scope(const scope_decl	&scope,
   const type_base_sptrs_type &canonical_types =
     scope.get_sorted_canonical_types();
 
-  ostream& o = ctxt.get_ostream();
   const config& c = ctxt.get_config();
 
   for (type_base_sptrs_type::const_iterator i = canonical_types.begin();
        i != canonical_types.end();
        ++i)
     {
-      o << "\n";
       if (is_member_type)
 	write_member_type(*i, ctxt, indent + c.get_xml_element_indent());
       else
@@ -2264,11 +2253,11 @@  write_translation_unit(write_context&	       ctxt,
 
   if (tu.is_empty())
     {
-      o << "/>";
+      o << "/>\n";
       return true;
     }
 
-  o << ">";
+  o << ">\n";
 
   write_canonical_types_of_scope(*tu.get_global_scope(),
 				 ctxt, indent);
@@ -2287,18 +2276,14 @@  write_translation_unit(write_context&	       ctxt,
 	    if (class_type->get_is_declaration_only()
 		&& !class_type->is_empty()
 		&& !ctxt.type_is_emitted(class_type))
-	    {
-	      o << "\n";
 	      write_type(class_type, ctxt,
 			 indent + c.get_xml_element_indent());
-	    }
 	  continue;
 	}
 
       if (decl_base_sptr d = is_decl(*i))
 	if (ctxt.decl_is_emitted(d))
 	  continue;
-      o << "\n";
       write_decl(*i, ctxt, indent + c.get_xml_element_indent());
     }
 
@@ -2361,13 +2346,11 @@  write_translation_unit(write_context&	       ctxt,
 	      if (decl_base* d = get_type_declaration(*i))
 		{
 		  decl_base_sptr decl(d, noop_deleter());
-		  o << "\n";
 		  write_decl_in_scope(decl, ctxt,
 				      indent + c.get_xml_element_indent());
 		}
 	      else if (function_type_sptr fn_type = is_function_type(t))
 		{
-		  o << "\n";
 		  write_function_type(fn_type, ctxt,
 				      indent + c.get_xml_element_indent());
 		}
@@ -2418,11 +2401,9 @@  write_translation_unit(write_context&	       ctxt,
 	continue;
 
       ABG_ASSERT(fn_type);
-      o << "\n";
       write_function_type(fn_type, ctxt, indent + c.get_xml_element_indent());
     }
 
-  o << "\n";
   do_indent(o, indent);
   o << "</abi-instr>\n";
 
@@ -2461,7 +2442,7 @@  write_type_decl(const type_decl_sptr& d, write_context& ctxt, unsigned indent)
 
   write_location(d, ctxt);
 
-  o << " id='" << ctxt.get_id_for_type(d) << "'" <<  "/>";
+  o << " id='" << ctxt.get_id_for_type(d) << "'" <<  "/>\n";
 
   ctxt.record_type_as_emitted(d);
 
@@ -2495,7 +2476,7 @@  write_namespace_decl(const namespace_decl_sptr& decl,
 
   o << "<namespace-decl name='"
     << xml::escape_xml_string(decl->get_name())
-    << "'>";
+    << "'>\n";
 
   typedef scope_decl::declarations		declarations;
   typedef declarations::const_iterator const_iterator;
@@ -2508,13 +2489,11 @@  write_namespace_decl(const namespace_decl_sptr& decl,
 	  // This type has already been emitted to the current
 	  // translation unit so do not emit it again.
 	  continue;
-      o << "\n";
       write_decl(*i, ctxt, indent + c.get_xml_element_indent());
     }
 
-  o << "\n";
   do_indent(o, indent);
-  o << "</namespace-decl>";
+  o << "</namespace-decl>\n";
 
   return true;
 }
@@ -2573,7 +2552,7 @@  write_qualified_type_def(const qualified_type_def_sptr&	decl,
   if (i.empty())
     i = ctxt.get_id_for_type(decl);
 
-  o<< " id='" << i << "'/>";
+  o<< " id='" << i << "'/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2649,7 +2628,7 @@  write_pointer_type_def(const pointer_type_def_sptr&	decl,
   o << " id='" << i << "'";
 
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2731,7 +2710,7 @@  write_reference_type_def(const reference_type_def_sptr&	decl,
 
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2857,7 +2836,7 @@  write_array_type_def(const array_type_def_sptr&	decl,
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
 
   if (!decl->get_dimension_count())
-    o << "/>";
+    o << "/>\n";
   else
     {
       o << ">\n";
@@ -2870,11 +2849,10 @@  write_array_type_def(const array_type_def_sptr&	decl,
 	  unsigned local_indent =
 	    indent + ctxt.get_config().get_xml_element_indent();
 	  write_array_subrange_type(*si, ctxt, local_indent);
-	  o << "\n";
 	}
 
       do_indent(o, indent);
-      o << "</array-type-def>";
+      o << "</array-type-def>\n";
     }
 
   ctxt.record_type_as_emitted(decl);
@@ -2963,7 +2941,7 @@  write_enum_type_decl(const enum_type_decl_sptr& decl,
     }
 
   do_indent(o, indent);
-  o << "</enum-decl>";
+  o << "</enum-decl>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -3040,7 +3018,7 @@  write_elf_symbol(const elf_symbol_sptr&	sym,
   if (sym->is_common_symbol())
     o << " is-common='yes'";
 
-  o << "/>";
+  o << "/>\n";
 
   return true;
 }
@@ -3063,14 +3041,9 @@  write_elf_symbols_table(const elf_symbols&	syms,
   if (syms.empty())
     return false;
 
-  ostream& o = ctxt.get_ostream();
-
   unordered_map<string, bool> emitted_syms;
   for (elf_symbols::const_iterator it = syms.begin(); it != syms.end(); ++it)
-    {
-      write_elf_symbol(*it, ctxt, indent);
-      o << "\n";
-    }
+    write_elf_symbol(*it, ctxt, indent);
 
   return true;
 }
@@ -3099,10 +3072,8 @@  write_elf_needed(const vector<string>&	needed,
        i != needed.end();
        ++i)
     {
-      if (i != needed.begin())
-	o << "\n";
       do_indent(o, indent);
-      o << "<dependency name='" << *i << "'/>";
+      o << "<dependency name='" << *i << "'/>\n";
     }
   return true;
 }
@@ -3154,7 +3125,7 @@  write_typedef_decl(const typedef_decl_sptr&	decl,
   if (i.empty())
     i = ctxt.get_id_for_type(decl);
 
-  o << " id='" << i << "'/>";
+  o << " id='" << i << "'/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -3221,7 +3192,7 @@  write_var_decl(const var_decl_sptr& decl, write_context& ctxt,
 
   write_elf_symbol_reference(decl->get_symbol(), o);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_decl_as_emitted(decl);
 
@@ -3323,7 +3294,7 @@  write_function_decl(const function_decl_sptr& decl, write_context& ctxt,
     }
 
   do_indent(o, indent);
-  o << "</function-decl>";
+  o << "</function-decl>\n";
 
   ctxt.record_decl_as_emitted(decl);
 
@@ -3374,8 +3345,8 @@  write_function_type(const function_type_sptr& fn_type,
   interned_string id = ctxt.get_id_for_type(fn_type);
 
   o << " id='"
-    <<  id << "'";
-  o << ">\n";
+    <<  id << "'"
+    << ">\n";
 
   type_base_sptr parm_type;
   for (vector<function_decl::parameter_sptr>::const_iterator pi =
@@ -3420,7 +3391,7 @@  write_function_type(const function_type_sptr& fn_type,
     }
 
   do_indent(o, indent);
-  o << "</function-type>";
+  o << "</function-type>\n";
 
   ctxt.record_type_as_emitted(fn_type);
   return true;
@@ -3490,15 +3461,10 @@  write_class_decl_opening_tag(const class_decl_sptr&	decl,
     i = ctxt.get_id_for_type(decl);
   o << " id='" << i << "'";
 
-  if (!prepare_to_handle_members)
-    o << ">\n";
+  if (prepare_to_handle_members && decl->has_no_base_nor_member())
+    o << "/>\n";
   else
-    {
-      if (decl->has_no_base_nor_member())
-	o << "/>";
-      else
-	o << ">\n";
-    }
+    o << ">\n";
 
   return true;
 }
@@ -3556,15 +3522,10 @@  write_union_decl_opening_tag(const union_decl_sptr&	decl,
     i = ctxt.get_id_for_type(decl);
   o << " id='" << i << "'";
 
-  if (!prepare_to_handle_members)
-    o << ">\n";
+  if (prepare_to_handle_members && decl->has_no_member())
+    o << "/>\n";
   else
-    {
-      if (decl->has_no_member())
-	o << "/>";
-      else
-	o << ">\n";
-    }
+    o << ">\n";
 
   return true;
 }
@@ -3658,7 +3619,6 @@  write_class_decl(const class_decl_sptr& decl,
 
 	  write_var_decl(*data, ctxt, is_static,
 			 get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</data-member>\n";
@@ -3690,7 +3650,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3719,7 +3678,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3740,7 +3698,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  o << ">\n";
 	  write_function_tdecl((*fn)->as_function_tdecl(), ctxt,
 			       get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
@@ -3758,14 +3715,13 @@  write_class_decl(const class_decl_sptr& decl,
 	  o << ">\n";
 	  write_class_tdecl((*cl)->as_class_tdecl(), ctxt,
 			    get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
 
       do_indent_to_level(ctxt, indent, 0);
 
-      o << "</class-decl>";
+      o << "</class-decl>\n";
     }
 
   // We allow several *declarations* of the same class in the corpus,
@@ -3845,7 +3801,6 @@  write_union_decl(const union_decl_sptr& decl,
 
 	  write_var_decl(*data, ctxt, is_static,
 			 get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</data-member>\n";
@@ -3877,7 +3832,6 @@  write_union_decl(const union_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3898,7 +3852,6 @@  write_union_decl(const union_decl_sptr& decl,
 	  o << ">\n";
 	  write_function_tdecl((*fn)->as_function_tdecl(), ctxt,
 			       get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
@@ -3916,14 +3869,13 @@  write_union_decl(const union_decl_sptr& decl,
 	  o << ">\n";
 	  write_class_tdecl((*cl)->as_class_tdecl(), ctxt,
 			    get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
 
       do_indent_to_level(ctxt, indent, 0);
 
-      o << "</union-decl>";
+      o << "</union-decl>\n";
     }
 
   // We allow several *declarations* of the same union in the corpus,
@@ -3965,7 +3917,7 @@  write_member_type_opening_tag(const type_base_sptr& t,
 
   o << "<member-type";
   write_access(decl, o);
-  o << ">";
+  o << ">\n";
 
   return true;
 }
@@ -3991,7 +3943,6 @@  write_member_type(const type_base_sptr& t, write_context& ctxt, unsigned indent)
   ostream& o = ctxt.get_ostream();
 
   write_member_type_opening_tag(t, ctxt, indent);
-  o << "\n";
 
   string id = ctxt.get_id_for_type(t);
 
@@ -4012,7 +3963,6 @@  write_member_type(const type_base_sptr& t, write_context& ctxt, unsigned indent)
 			     id, ctxt, nb_ws)
 	 || write_class_decl(dynamic_pointer_cast<class_decl>(t),
 			     id, ctxt, nb_ws));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
   o << "</member-type>\n";
@@ -4055,7 +4005,7 @@  write_type_tparameter(const type_tparameter_sptr	decl,
 
   write_location(decl, ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -4092,7 +4042,7 @@  write_non_type_tparameter(
 
   write_location(decl, ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   return true;
 }
@@ -4136,13 +4086,10 @@  write_template_tparameter (const template_tparameter_sptr	decl,
 	 decl->get_template_parameters().begin();
        p != decl->get_template_parameters().end();
        ++p)
-    {
-      write_template_parameter(decl, ctxt, nb_spaces);
-      o <<"\n";
-    }
+    write_template_parameter(decl, ctxt, nb_spaces);
 
   do_indent_to_level(ctxt, indent, 0);
-  o << "</template-template-parameter>";
+  o << "</template-template-parameter>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -4186,10 +4133,8 @@  write_type_composition
    (dynamic_pointer_cast<qualified_type_def>(decl->get_composed_type()),
     ctxt, nb_spaces));
 
-  o << "\n";
-
   do_indent_to_level(ctxt, indent, 0);
-  o << "</template-parameter-type-composition>";
+  o << "</template-parameter-type-composition>\n";
 
   return true;
 }
@@ -4233,17 +4178,12 @@  write_template_parameters(const shared_ptr<template_decl> tmpl,
   if (!tmpl)
     return;
 
-  ostream &o = ctxt.get_ostream();
-
   unsigned nb_spaces = get_indent_to_level(ctxt, indent, 1);
   for (list<shared_ptr<template_parameter> >::const_iterator p =
 	 tmpl->get_template_parameters().begin();
        p != tmpl->get_template_parameters().end();
        ++p)
-    {
-      write_template_parameter(*p, ctxt, nb_spaces);
-      o << "\n";
-    }
+    write_template_parameter(*p, ctxt, nb_spaces);
 }
 
 /// Serialize an instance of function_tdecl.
@@ -4279,11 +4219,10 @@  write_function_tdecl(const shared_ptr<function_tdecl> decl,
   write_function_decl(decl->get_pattern(), ctxt,
 		      /*skip_first_parameter=*/false,
 		      get_indent_to_level(ctxt, indent, 1));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
 
-  o << "</function-template-decl>";
+  o << "</function-template-decl>\n";
 
   return true;
 }
@@ -4322,11 +4261,10 @@  write_class_tdecl(const shared_ptr<class_tdecl> decl,
 
   write_class_decl(decl->get_pattern(), ctxt,
 		   get_indent_to_level(ctxt, indent, 1));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
 
-  o << "</class-template-decl>";
+  o << "</class-template-decl>\n";
 
   return true;
 }
@@ -4591,7 +4529,6 @@  write_corpus(write_context&	ctxt,
       out << "<elf-needed>\n";
       write_elf_needed(corpus->get_needed(), ctxt,
 		       get_indent_to_level(ctxt, indent, 2));
-      out << "\n";
       do_indent_to_level(ctxt, indent, 1);
       out << "</elf-needed>\n";
     }
@@ -4712,7 +4649,6 @@  dump(const decl_base_sptr d, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(d->get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_decl(d, ctxt, /*indent=*/0);
-  o << "\n";
 }
 
 /// Serialize a pointer to decl_base to stderr.
@@ -4757,7 +4693,6 @@  dump(const var_decl_sptr v, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(v->get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_var_decl(v, ctxt, /*linkage_name*/true, /*indent=*/0);
-  cerr << "\n";
 }
 
 /// Serialize a pointer to var_decl to stderr.
@@ -4782,7 +4717,6 @@  dump(const translation_unit& t, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(t.get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_translation_unit(ctxt, t, /*indent=*/0);
-  o << "\n";
 }
 
 /// Serialize an instance of @ref translation_unit to stderr.
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 627f72af..f5f868dc 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -16,7 +16,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -66,7 +65,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='infinite' id='type-id-16'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-17'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-18'/>
@@ -232,7 +230,6 @@ 
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::string -->
       <typedef-decl name='string' type-id='type-id-51' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-72'/>
     </namespace-decl>
@@ -334,7 +331,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <!-- wint_t btowc(int) -->
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -962,72 +958,58 @@ 
     <namespace-decl name='std'>
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='112' column='1' id='type-id-51'>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-81' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-57'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef rebind<char>::other std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_CharT_alloc_type -->
             <typedef-decl name='_CharT_alloc_type' type-id='type-id-83' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='114' column='1' id='type-id-82'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char_traits<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::traits_type -->
             <typedef-decl name='traits_type' type-id='type-id-85' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='118' column='1' id='type-id-84'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char_traits<char>::char_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::value_type -->
             <typedef-decl name='value_type' type-id='type-id-87' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='119' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='120' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::difference_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::difference_type -->
             <typedef-decl name='difference_type' type-id='type-id-90' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='122' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-92' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='123' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-94' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='124' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::pointer std::basic_string<char, std::char_traits<char>, std::allocator<char> >::pointer -->
             <typedef-decl name='pointer' type-id='type-id-96' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='125' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::const_pointer std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-98' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-100' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='127' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-102' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='129' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-104' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='130' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-106' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='131' column='1' id='type-id-105'/>
@@ -2825,32 +2807,26 @@ 
     </namespace-decl>
     <!-- class allocator<char> -->
     <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-39'>
-
         <member-type access='public'>
           <!-- typedef std::size_t allocator<char>::size_type -->
           <typedef-decl name='size_type' type-id='type-id-109' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='95' column='1' id='type-id-81'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef std::ptrdiff_t allocator<char>::difference_type -->
           <typedef-decl name='difference_type' type-id='type-id-110' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='96' column='1' id='type-id-90'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef char& allocator<char>::reference -->
           <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-92'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef const char& allocator<char>::const_reference -->
           <typedef-decl name='const_reference' type-id='type-id-44' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-94'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef char* allocator<char>::pointer -->
           <typedef-decl name='pointer' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-96'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef const char* allocator<char>::const_pointer -->
           <typedef-decl name='const_pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='98' column='1' id='type-id-98'/>
@@ -2869,7 +2845,6 @@ 
     </namespace-decl>
     <!-- struct rebind<char> -->
     <class-decl name='rebind&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-111'>
-
         <member-type access='public'>
           <!-- typedef allocator<char> rebind<char>::other -->
           <typedef-decl name='other' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='105' column='1' id='type-id-83'/>
@@ -2877,7 +2852,6 @@ 
     </class-decl>
     <!-- struct char_traits<char> -->
     <class-decl name='char_traits&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-85'>
-
         <member-type access='public'>
           <!-- typedef char char_traits<char>::char_type -->
           <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.8.2/bits/char_traits.h' line='235' column='1' id='type-id-87'/>
@@ -2897,23 +2871,10 @@ 
       <!-- void -->
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
     <!-- struct _IO_FILE -->
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-21'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
     <!-- void emit(std::string&, std::string&) -->
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
       <!-- parameter of type 'std::string&' -->
@@ -2923,15 +2884,5 @@ 
       <!-- void -->
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index 5b8cb006..0c6078af 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -18,8 +18,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -28,7 +26,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
@@ -75,7 +72,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-20'/>
@@ -95,7 +91,6 @@ 
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <!-- struct {int __count; union {unsigned int __wch; char __wchb[4];} __value;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
@@ -384,10 +379,8 @@ 
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
@@ -412,47 +405,38 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
@@ -470,7 +454,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
@@ -2293,17 +2276,14 @@ 
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
       <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <!-- typedef std::size_t std::allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& std::allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& std::allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
@@ -2357,12 +2337,10 @@ 
       </function-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
@@ -2529,30 +2507,24 @@ 
     </namespace-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
-
       <!-- class __gnu_cxx::new_allocator<char> -->
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <!-- typedef std::size_t __gnu_cxx::new_allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char* __gnu_cxx::new_allocator<char>::pointer -->
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char* __gnu_cxx::new_allocator<char>::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& __gnu_cxx::new_allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& __gnu_cxx::new_allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
@@ -3347,7 +3319,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 5b8cb006..0c6078af 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -18,8 +18,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -28,7 +26,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
@@ -75,7 +72,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-20'/>
@@ -95,7 +91,6 @@ 
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <!-- struct {int __count; union {unsigned int __wch; char __wchb[4];} __value;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
@@ -384,10 +379,8 @@ 
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
@@ -412,47 +405,38 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
@@ -470,7 +454,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
@@ -2293,17 +2276,14 @@ 
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
       <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <!-- typedef std::size_t std::allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& std::allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& std::allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
@@ -2357,12 +2337,10 @@ 
       </function-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
@@ -2529,30 +2507,24 @@ 
     </namespace-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
-
       <!-- class __gnu_cxx::new_allocator<char> -->
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <!-- typedef std::size_t __gnu_cxx::new_allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char* __gnu_cxx::new_allocator<char>::pointer -->
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char* __gnu_cxx::new_allocator<char>::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& __gnu_cxx::new_allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& __gnu_cxx::new_allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
@@ -3347,7 +3319,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi
index 83496d0f..08ad50fa 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -18,7 +18,6 @@ 
     <type-decl name='void' id='type-id-6'/>
     <!-- struct S -->
     <class-decl name='S' size-in-bits='256' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='1' column='1' id='type-id-7'>
-
         <member-type access='public'>
           <!-- struct {int m;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='4' column='1' id='type-id-8'>
@@ -28,7 +27,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {char bar;} -->
           <class-decl name='__anonymous_struct__1' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='9' column='1' id='type-id-9'>
@@ -38,7 +36,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {char baz;} -->
           <class-decl name='__anonymous_struct__2' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='14' column='1' id='type-id-10'>
@@ -48,7 +45,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1' id='type-id-11'>
@@ -57,7 +53,6 @@ 
             <enumerator name='two' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='20' column='1' id='type-id-12'>
@@ -66,7 +61,6 @@ 
             <enumerator name='four' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1' id='type-id-13'>
@@ -75,7 +69,6 @@ 
             <enumerator name='six' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {int a; char b;} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='24' column='1' id='type-id-14'>
@@ -89,7 +82,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {unsigned int c; double d;} -->
           <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='26' column='1' id='type-id-15'>
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index cab842e3..1cdd44b1 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -100,12 +100,10 @@ 
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-7'/>
     <!-- struct b1 -->
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='type-id-8'/>
-
         <member-type access='public'>
           <!-- typedef int s0::integer -->
           <typedef-decl name='integer' type-id='type-id-3' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='type-id-10'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef unsigned char s0::byte -->
           <typedef-decl name='byte' type-id='type-id-5' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='type-id-11'/>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 208d7d59..efb83bcc 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -823,12 +823,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-connection.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
     <!-- DBusHeaderField[10] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='320' id='type-id-34'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-27' id='type-id-35'/>
-
     </array-type-def>
     <!-- struct DBusCMutex -->
     <class-decl name='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
@@ -2859,19 +2857,15 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-server.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
-
     <!-- char[16] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-152'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-27' id='type-id-153'/>
-
     </array-type-def>
     <!-- dbus_uint32_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-154'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-27' id='type-id-155'/>
-
     </array-type-def>
     <!-- struct DBusServer -->
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-156'>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 6dfa87e4..9e57a6d5 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -127,19 +127,15 @@ 
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- REAL[160] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
       <!-- <anonymous range>[160] -->
       <subrange length='160' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <!-- REAL[40] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
     </array-type-def>
     <!-- struct BasicCurveEvaluator -->
     <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
@@ -857,7 +853,6 @@ 
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
     <!-- class CachingEvaluator -->
     <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-
         <member-type access='private'>
           <!-- enum CachingEvaluator::ServiceMode -->
           <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
@@ -2898,12 +2893,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- GLfloat[4] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- typedef void (typedef GLenum)* errorCallbackType -->
     <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
@@ -3672,52 +3665,42 @@ 
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-46'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- GLint[2] -->
     <array-type-def dimensions='1' type-id='type-id-60' size-in-bits='64' id='type-id-50'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-89'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[3] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-90'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- REAL[40][4] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='5120' id='type-id-52'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- REAL[6400] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='204800' id='type-id-53'>
       <!-- <anonymous range>[6400] -->
       <subrange length='6400' type-id='type-id-3' id='type-id-92'/>
-
     </array-type-def>
     <!-- StoredVertex*[3] -->
     <array-type-def dimensions='1' type-id='type-id-93' size-in-bits='192' id='type-id-49'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- long int[2] -->
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class StoredVertex -->
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
@@ -4414,14 +4397,12 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-106'/>
     <!-- char*[32] -->
     <array-type-def dimensions='1' type-id='type-id-107' size-in-bits='2048' id='type-id-108'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-3' id='type-id-109'/>
-
     </array-type-def>
     <!-- struct Arc -->
     <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-110'>
@@ -4758,7 +4739,6 @@ 
     </class-decl>
     <!-- class Pool -->
     <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-68'>
-
         <member-type access='protected'>
           <!-- enum Pool::Magic -->
           <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
@@ -5052,25 +5032,19 @@ 
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- REAL[4] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-131'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- REAL[][24][24] -->
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='infinite' id='type-id-132'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-133'/>
-
       <!-- <anonymous range>[24] -->
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
       <!-- <anonymous range>[24] -->
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
     </array-type-def>
     <!-- struct Curvelist -->
     <class-decl name='Curvelist' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/curvelist.h' line='47' column='1' id='type-id-135'>
@@ -6202,7 +6176,6 @@ 
     </class-decl>
     <!-- class Subdivider -->
     <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-66'>
-
         <member-type access='private'>
           <!-- enum Subdivider::dir -->
           <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
@@ -8270,10 +8243,8 @@ 
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-191'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- struct GridVertex -->
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-202'>
@@ -9197,46 +9168,37 @@ 
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-209'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- Quiltspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-216' size-in-bits='640' id='type-id-164'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[120] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-217'>
       <!-- <anonymous range>[120] -->
       <subrange length='120' type-id='type-id-3' id='type-id-218'/>
-
     </array-type-def>
     <!-- REAL[5] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-219'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- REAL[5][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-221'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- float[4] -->
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class Curve -->
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-224'>
@@ -10464,7 +10426,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- Curvelist* -->
     <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-138'/>
@@ -10622,7 +10583,6 @@ 
     <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-243'>
     <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-210'/>
-
         <member-type access='private'>
           <!-- struct Hull::Side -->
           <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-244'>
@@ -10875,7 +10835,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-193' size-in-bits='128' id='type-id-249'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class Mesher -->
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-183'>
@@ -11155,7 +11114,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-253' size-in-bits='64' id='type-id-254'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- typedef float Real -->
     <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
@@ -11891,7 +11849,6 @@ 
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-272'>
     <!-- class PooledObj -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
-
         <member-type access='public'>
           <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-273'>
@@ -12026,27 +11983,22 @@ 
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-141'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- Patchspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-276' size-in-bits='640' id='type-id-277'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[2880] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='92160' id='type-id-278'>
       <!-- <anonymous range>[2880] -->
       <subrange length='2880' type-id='type-id-3' id='type-id-279'/>
-
     </array-type-def>
     <!-- REAL[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='320' id='type-id-280'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- struct Pspec -->
     <class-decl name='Pspec' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/patch.h' line='46' column='1' id='type-id-281'>
@@ -12296,7 +12248,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-281' size-in-bits='512' id='type-id-180'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- Patchlist* -->
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-181'/>
@@ -13356,18 +13307,15 @@ 
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- REAL[1000] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-300'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <!-- long int[1000] -->
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <!-- class Varray -->
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
@@ -14518,28 +14466,20 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
-
-
-
-
-
     <!-- CachedVertex[100] -->
     <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='25600' id='type-id-319'>
       <!-- <anonymous range>[100] -->
       <subrange length='100' type-id='type-id-3' id='type-id-320'/>
-
     </array-type-def>
     <!-- GLdouble[3] -->
     <array-type-def dimensions='1' type-id='type-id-321' size-in-bits='192' id='type-id-322'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- __jmp_buf_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1600' id='type-id-324'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-30'/>
@@ -14549,7 +14489,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
@@ -14559,7 +14498,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-328'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-3' id='type-id-329'/>
-
     </array-type-def>
     <!-- typedef GLUtesselator GLUtesselator -->
     <typedef-decl name='GLUtesselator' type-id='type-id-330' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-331'/>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 4e93c02d..2fb415c2 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3036,8 +3036,6 @@ 
     <elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
-
     <!-- void* dlvsym(void*, const char*, const char*) -->
     <function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -3051,7 +3049,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- struct backtrace_freelist_struct -->
@@ -3562,19 +3559,15 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
-
-
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-36' size-in-bits='8448' id='type-id-37'>
       <!-- <anonymous range>[33] -->
       <subrange length='33' type-id='type-id-38' id='type-id-39'/>
-
     </array-type-def>
     <!-- const demangle_operator_info[62] -->
     <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='11904' id='type-id-41'>
       <!-- <anonymous range>[62] -->
       <subrange length='62' type-id='type-id-38' id='type-id-42'/>
-
     </array-type-def>
     <!-- struct demangle_component -->
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='453' column='1' id='type-id-43'>
@@ -4218,7 +4211,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- __sanitizer::LowLevelAllocator* -->
@@ -4325,18 +4317,15 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- AddressRange[6] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='768' id='type-id-85'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <!-- char[4096] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='32768' id='type-id-88'>
       <!-- <anonymous range>[4096] -->
       <subrange length='4096' type-id='type-id-38' id='type-id-89'/>
-
     </array-type-def>
     <!-- __sanitizer::InternalScopedString* -->
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-91'/>
@@ -4488,7 +4477,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::StackTrace -->
       <class-decl name='StackTrace' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='31' column='1' id='type-id-94'>
-
           <member-type access='public'>
             <!-- typedef bool (void*, char*, int)* __sanitizer::StackTrace::SymbolizeCallback -->
             <typedef-decl name='SymbolizeCallback' type-id='type-id-99' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='33' column='1' id='type-id-113'/>
@@ -4673,7 +4661,6 @@ 
       </function-decl>
       <!-- class __sanitizer::LoadedModule -->
       <class-decl name='LoadedModule' size-in-bits='960' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='442' column='1' id='type-id-92'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LoadedModule::AddressRange -->
             <class-decl name='AddressRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='452' column='1' id='type-id-84'>
@@ -5373,14 +5360,12 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='2048' id='type-id-138'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- struct sigaltstack -->
     <class-decl name='sigaltstack' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/bits/sigstack.h' line='50' column='1' id='type-id-140'>
@@ -5424,7 +5409,6 @@ 
     <typedef-decl name='Elf64_Dyn' type-id='type-id-145' filepath='/usr/include/elf.h' line='650' column='1' id='type-id-146'/>
     <!-- struct {Elf64_Sxword d_tag; union {Elf64_Xword d_val; Elf64_Addr d_ptr;} d_un;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-146' visibility='default' filepath='/usr/include/elf.h' line='643' column='1' id='type-id-145'>
-
         <member-type access='public'>
           <!-- union {Elf64_Xword d_val; Elf64_Addr d_ptr;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/elf.h' line='646' column='1' id='type-id-147'>
@@ -5711,7 +5695,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::__sanitizer_kernel_sigaction_t -->
       <class-decl name='__sanitizer_kernel_sigaction_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='423' column='1' id='type-id-155'>
-
           <member-type access='public'>
             <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='424' column='1' id='type-id-177'>
@@ -6203,12 +6186,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- char[56] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='448' id='type-id-184'>
       <!-- <anonymous range>[56] -->
       <subrange length='56' type-id='type-id-38' id='type-id-185'/>
-
     </array-type-def>
     <!-- typedef __anonymous_enum__ _Unwind_Reason_Code -->
     <typedef-decl name='_Unwind_Reason_Code' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='76' column='1' id='type-id-187'/>
@@ -7728,12 +7709,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- unsigned long int[1] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='64' id='type-id-211'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-38' id='type-id-212'/>
-
     </array-type-def>
     <!-- __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>* -->
     <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
@@ -7780,7 +7759,6 @@ 
       </function-decl>
       <!-- class __sanitizer::StackDepotReverseMap -->
       <class-decl name='StackDepotReverseMap' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='39' column='1' id='type-id-215'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::StackDepotReverseMap::IdDescPair -->
             <class-decl name='IdDescPair' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='45' column='1' id='type-id-217'>
@@ -8111,10 +8089,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- typedef __pid_t pid_t -->
@@ -8358,7 +8334,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
@@ -8381,7 +8356,6 @@ 
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-253'/>
     <!-- void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* -->
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-255'/>
-
     <!-- int (void*, uintptr_t, const char*, int, const char*) -->
     <function-type size-in-bits='64' id='type-id-258'>
       <!-- parameter of type 'void*' -->
@@ -8438,14 +8412,12 @@ 
     <class-decl name='backtrace_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-256'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- char[16384] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='131072' id='type-id-262'>
       <!-- <anonymous range>[16384] -->
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <!-- __sanitizer::ExternalSymbolizer* -->
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
@@ -8784,7 +8756,6 @@ 
       </class-decl>
       <!-- class __sanitizer::InternalSymbolizer -->
       <class-decl name='InternalSymbolizer' size-in-bits='131072' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='321' column='1' id='type-id-266'>
-
           <member-type access='public'>
             <!-- typedef bool (const char*, typedef __sanitizer::u64, char*, int)* __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
             <typedef-decl name='SanitizerSymbolizeFn' type-id='type-id-276' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='323' column='1' id='type-id-282'/>
@@ -8966,10 +8937,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-5'/>
     <!-- long long unsigned int -->
@@ -8978,7 +8947,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1048576' id='type-id-283'>
       <!-- <anonymous range>[16384] -->
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <!-- sizetype -->
     <type-decl name='sizetype' size-in-bits='64' id='type-id-38'/>
@@ -9465,7 +9433,6 @@ 
         <return type-id='type-id-304'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::CommonFlags* -->
@@ -9557,44 +9524,32 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
     <!-- LibCodeRange[128] -->
     <array-type-def dimensions='1' type-id='type-id-310' size-in-bits='16384' id='type-id-311'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- Lib[128] -->
     <array-type-def dimensions='1' type-id='type-id-313' size-in-bits='32768' id='type-id-314'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- SignalDesc[64] -->
     <array-type-def dimensions='1' type-id='type-id-315' size-in-bits='552960' id='type-id-316'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- bool[128] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1024' id='type-id-318'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- char[14] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='112' id='type-id-319'>
       <!-- <anonymous range>[14] -->
       <subrange length='14' type-id='type-id-38' id='type-id-320'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-321'>
@@ -9623,7 +9578,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-324' size-in-bits='64000' id='type-id-325'>
       <!-- <anonymous range>[500] -->
       <subrange length='500' type-id='type-id-38' id='type-id-326'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-327'/>
@@ -9633,49 +9587,41 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='7552' id='type-id-329'>
       <!-- <anonymous range>[118] -->
       <subrange length='118' type-id='type-id-38' id='type-id-330'/>
-
     </array-type-def>
     <!-- long long unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1024' id='type-id-331'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='48' id='type-id-333'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <!-- unsigned char[8] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-334'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-38' id='type-id-335'/>
-
     </array-type-def>
     <!-- unsigned long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='1024' id='type-id-336'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned long int[4] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='256' id='type-id-337'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <!-- void*[128] -->
     <array-type-def dimensions='1' type-id='type-id-108' size-in-bits='8192' id='type-id-339'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-340'/>
     <!-- struct ioctl_desc -->
     <class-decl name='ioctl_desc' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='13' column='1' id='type-id-324'>
-
         <member-type access='public'>
           <!-- enum ioctl_desc::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='16' column='1' id='type-id-341'>
@@ -9793,7 +9739,6 @@ 
     </class-decl>
     <!-- class AtExitContext -->
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-353'>
-
         <member-type access='public'>
           <!-- typedef void ()* AtExitContext::atexit_t -->
           <typedef-decl name='atexit_t' type-id='type-id-108' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='288' column='1' id='type-id-354'/>
@@ -10021,7 +9966,6 @@ 
     <typedef-decl name='OFF_T' type-id='type-id-171' filepath='../../.././libsanitizer/interception/interception.h' line='28' column='1' id='type-id-381'/>
     <!-- struct sigaction_t -->
     <class-decl name='sigaction_t' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='91' column='1' id='type-id-382'>
-
         <member-type access='public'>
           <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='92' column='1' id='type-id-383'>
@@ -11279,7 +11223,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::atomic_uint32_t -->
       <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-958'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u32 __sanitizer::atomic_uint32_t::Type -->
             <typedef-decl name='Type' type-id='type-id-170' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-175'/>
@@ -11854,7 +11797,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LibIgnore -->
       <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-891'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LibIgnore::Lib -->
             <class-decl name='Lib' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='43' column='1' id='type-id-313'>
@@ -11876,7 +11818,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LibIgnore::LibCodeRange -->
             <class-decl name='LibCodeRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='50' column='1' id='type-id-310'>
@@ -26317,7 +26258,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='1024' id='type-id-1223'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- __tsan::DynamicAnnContext* -->
     <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
@@ -27059,69 +26999,47 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <!-- __int128 -->
     <type-decl name='__int128' size-in-bits='128' id='type-id-1238'/>
     <!-- SizeClassInfo[53] -->
     <array-type-def dimensions='1' type-id='type-id-1239' size-in-bits='27136' id='type-id-1240'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-1242' size-in-bits='440960' id='type-id-1243'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-1244' size-in-bits='875136' id='type-id-1245'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- atomic_uint64_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-1246' size-in-bits='256' id='type-id-1247'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <!-- atomic_uintptr_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1200' size-in-bits='131072' id='type-id-1248'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-38' id='type-id-1249'/>
-
     </array-type-def>
     <!-- MD5Hash[2] -->
     <array-type-def dimensions='1' type-id='type-id-1250' size-in-bits='256' id='type-id-1251'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <!-- Desc[16] -->
     <array-type-def dimensions='1' type-id='type-id-1253' size-in-bits='3072' id='type-id-1254'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- Part[1009] -->
     <array-type-def dimensions='1' type-id='type-id-1255' size-in-bits='516608' id='type-id-1256'>
       <!-- <anonymous range>[1009] -->
       <subrange length='1009' type-id='type-id-38' id='type-id-1257'/>
-
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-116'/>
@@ -27131,13 +27049,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='256' id='type-id-1258'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-38' id='type-id-1259'/>
-
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='384' id='type-id-1260'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-38' id='type-id-1261'/>
-
     </array-type-def>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-33'/>
@@ -27145,25 +27061,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='704' id='type-id-1262'>
       <!-- <anonymous range>[11] -->
       <subrange length='11' type-id='type-id-38' id='type-id-1263'/>
-
     </array-type-def>
     <!-- long long unsigned int[23] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1472' id='type-id-1264'>
       <!-- <anonymous range>[23] -->
       <subrange length='23' type-id='type-id-38' id='type-id-1265'/>
-
     </array-type-def>
     <!-- long long unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='128' id='type-id-1266'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <!-- long long unsigned int[438] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='28032' id='type-id-1267'>
       <!-- <anonymous range>[438] -->
       <subrange length='438' type-id='type-id-38' id='type-id-1268'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-62'/>
@@ -27173,25 +27085,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-129' size-in-bits='512' id='type-id-1269'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned long int[10] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='640' id='type-id-1270'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-38' id='type-id-1271'/>
-
     </array-type-def>
     <!-- void*[128] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-356'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- void*[256] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-1272'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- enum LinkerInitialized -->
     <enum-decl name='LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='283' column='1' id='type-id-1201'>
@@ -27586,7 +27494,6 @@ 
       <typedef-decl name='u32' type-id='type-id-129' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-170'/>
       <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > -->
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1319'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass -->
             <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1244'>
@@ -27604,7 +27511,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1472'/>
@@ -27783,7 +27689,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uint64_t -->
       <class-decl name='atomic_uint64_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='43' column='1' id='type-id-1246'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u64 __sanitizer::atomic_uint64_t::Type -->
             <typedef-decl name='Type' type-id='type-id-173' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='44' column='1' id='type-id-304'/>
@@ -27952,7 +27857,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uint8_t -->
       <class-decl name='atomic_uint8_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='28' column='1' id='type-id-1474'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u8 __sanitizer::atomic_uint8_t::Type -->
             <typedef-decl name='Type' type-id='type-id-1338' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='29' column='1' id='type-id-1463'/>
@@ -27966,7 +27870,6 @@ 
       <typedef-decl name='u8' type-id='type-id-17' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='66' column='1' id='type-id-1338'/>
       <!-- class __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> -->
       <class-decl name='SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='305' column='1' id='type-id-1309'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::RegionInfo -->
             <class-decl name='RegionInfo' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='474' column='1' id='type-id-1315'>
@@ -28004,12 +27907,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1313'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::AllocatorCache -->
             <typedef-decl name='AllocatorCache' type-id='type-id-1319' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='310' column='1' id='type-id-1311'/>
@@ -28424,7 +28325,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassMap<17ul, 128ul, 16ul> -->
       <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1476'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch -->
             <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1321'>
@@ -28541,12 +28441,10 @@ 
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-1461' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-1475'/>
       <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > -->
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1317'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1477'/>
           </member-type>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass -->
             <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1242'>
@@ -28677,7 +28575,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> -->
       <class-decl name='SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='158272' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='677' column='1' id='type-id-1302'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::SizeClassInfo -->
             <class-decl name='SizeClassInfo' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='820' column='1' id='type-id-1239'>
@@ -28695,12 +28592,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='679' column='1' id='type-id-1306'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::AllocatorCache -->
             <typedef-decl name='AllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='682' column='1' id='type-id-1304'/>
@@ -29111,7 +29006,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassMap<17ul, 64ul, 14ul> -->
       <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1478'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch -->
             <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1323'>
@@ -29328,7 +29222,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uintptr_t -->
       <class-decl name='atomic_uintptr_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='48' column='1' id='type-id-1200'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::uptr __sanitizer::atomic_uintptr_t::Type -->
             <typedef-decl name='Type' type-id='type-id-83' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='49' column='1' id='type-id-1465'/>
@@ -29342,12 +29235,10 @@ 
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-1480'/>
       <!-- class __sanitizer::ThreadRegistry -->
       <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-1333'>
-
           <member-type access='public'>
             <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
             <typedef-decl name='ThreadCallback' type-id='type-id-1459' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-1481'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::FindThreadCallback -->
             <typedef-decl name='FindThreadCallback' type-id='type-id-1384' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='99' column='1' id='type-id-1482'/>
@@ -30687,7 +30578,6 @@ 
       </class-decl>
       <!-- class __tsan::MutexSet -->
       <class-decl name='MutexSet' size-in-bits='3136' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='19' column='1' id='type-id-1355'>
-
           <member-type access='public'>
             <!-- struct __tsan::MutexSet::Desc -->
             <class-decl name='Desc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='24' column='1' id='type-id-1253'>
@@ -31266,7 +31156,6 @@ 
       </class-decl>
       <!-- class __tsan::SyncTab -->
       <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-1364'>
-
           <member-type access='private'>
             <!-- struct __tsan::SyncTab::Part -->
             <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-1255'>
@@ -33621,7 +33510,6 @@ 
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <!-- __tsan::ScopedJavaFunc* -->
     <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- class __tsan::ScopedJavaFunc -->
@@ -33812,13 +33700,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-1497'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- __tsan::__anonymous_struct__* -->
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-1500'/>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- struct {__tsan::MD5_u32plus lo; __tsan::MD5_u32plus hi; __tsan::MD5_u32plus a; __tsan::MD5_u32plus b; __tsan::MD5_u32plus c; __tsan::MD5_u32plus d; unsigned char buffer[64]; unsigned int block[16];} -->
@@ -33906,30 +33792,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1503' size-in-bits='16777216' id='type-id-1504'>
       <!-- <anonymous range>[262144] -->
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <!-- Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1506' size-in-bits='16777216' id='type-id-1507'>
       <!-- <anonymous range>[262144] -->
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <!-- unsigned long int[64] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4096' id='type-id-1508'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- void*[64] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-1479'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- __sanitizer::CombinedAllocator<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >, __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap> >* -->
     <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
@@ -34281,7 +34162,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap> -->
       <class-decl name='LargeMmapAllocator&lt;__sanitizer::CrashOnMapUnmap&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1517'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>::Stats -->
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1538'>
@@ -34307,7 +34187,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1519'>
@@ -34819,7 +34698,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback> -->
       <class-decl name='LargeMmapAllocator&lt;__tsan::MapUnmapCallback&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1520'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback>::Stats -->
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1540'>
@@ -34845,7 +34723,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback>::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1522'>
@@ -35412,8 +35289,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- struct rlimit -->
@@ -37733,12 +37608,10 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- char[431104] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='3448832' id='type-id-1655'>
       <!-- <anonymous range>[431104] -->
       <subrange length='431104' type-id='type-id-38' id='type-id-1656'/>
-
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::StaticSpinMutex>* -->
     <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
@@ -38545,7 +38418,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- void __tsan::ReleaseStoreImpl(__tsan::ThreadState*, __sanitizer::uptr, __tsan::SyncClock*) -->
@@ -38930,31 +38802,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
     <!-- TraceHeader[256] -->
     <array-type-def dimensions='1' type-id='type-id-1693' size-in-bits='5062656' id='type-id-1694'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- char[64] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='512' id='type-id-1483'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- unsigned long int[256] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='16384' id='type-id-114'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4194304' id='type-id-1695'>
       <!-- <anonymous range>[65536] -->
       <subrange length='65536' type-id='type-id-38' id='type-id-1696'/>
-
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>* -->
     <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
@@ -40175,8 +40041,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::Suppression* const -->
@@ -40503,7 +40367,6 @@ 
       </class-decl>
       <!-- class __sanitizer::Symbolizer -->
       <class-decl name='Symbolizer' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='64' column='1' id='type-id-277'>
-
           <member-type access='protected'>
             <!-- class __sanitizer::Symbolizer::SymbolizerScope -->
             <class-decl name='SymbolizerScope' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='133' column='1' id='type-id-273'>
@@ -40557,12 +40420,10 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
             <typedef-decl name='StartSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-1739'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
             <typedef-decl name='EndSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-1740'/>
@@ -41240,7 +41101,6 @@ 
       </function-decl>
       <!-- struct __tsan::MBlock -->
       <class-decl name='MBlock' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='52' column='1' id='type-id-1758'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::GenericScopedLock<__tsan::MBlock> __tsan::MBlock::ScopedLock -->
             <typedef-decl name='ScopedLock' type-id='type-id-1754' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='119' column='1' id='type-id-1767'/>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 42d5f812..4814b0f2 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -519,8 +519,6 @@ 
     <elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -529,13 +527,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-3'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- hb_user_data_item_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='384' id='type-id-7'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
@@ -1002,7 +998,6 @@ 
     </class-decl>
     <!-- struct hb_user_data_array_t -->
     <class-decl name='hb_user_data_array_t' size-in-bits='832' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='70' column='1' id='type-id-17'>
-
         <member-type access='public'>
           <!-- struct hb_user_data_array_t::hb_user_data_item_t -->
           <class-decl name='hb_user_data_item_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='71' column='1' id='type-id-6'>
@@ -1286,35 +1281,27 @@ 
     </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'>
-
-
-
     <!-- const char*[8] -->
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='512' id='type-id-62'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- hb_codepoint_t[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-64' size-in-bits='320' id='type-id-65'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-66'/>
-
     </array-type-def>
     <!-- int16_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-67' size-in-bits='32' id='type-id-68'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- int8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='32' id='type-id-70'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-72'/>
@@ -1324,19 +1311,16 @@ 
     <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='32' id='type-id-75'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- uint8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='32' id='type-id-77'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- uint8_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='64' id='type-id-78'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-79'/>
@@ -1344,7 +1328,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64' id='type-id-80'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- unsigned short int -->
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-81'/>
@@ -1359,7 +1342,6 @@ 
     <typedef-decl name='hb_buffer_t' type-id='type-id-83' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-84'/>
     <!-- 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-83'>
-
         <member-type access='public'>
           <!-- typedef long int hb_buffer_t::scratch_buffer_t -->
           <typedef-decl name='scratch_buffer_t' type-id='type-id-10' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-85'/>
@@ -2031,7 +2013,6 @@ 
     <typedef-decl name='hb_codepoint_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-64'/>
     <!-- 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-106'>
-
         <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-109'>
@@ -2069,7 +2050,6 @@ 
             </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__1' 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-117'>
@@ -2107,7 +2087,6 @@ 
             </data-member>
           </class-decl>
         </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__2' 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-118'>
@@ -3867,12 +3846,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- const char[1] -->
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='8' id='type-id-131'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- struct hb_language_item_t -->
     <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-179'>
@@ -4044,23 +4021,19 @@ 
     <array-type-def dimensions='1' type-id='type-id-185' size-in-bits='32' id='type-id-186'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- TableRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-187' size-in-bits='128' id='type-id-188'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- uint8_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-189'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- struct hb_font_funcs_t -->
     <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-190'>
-
         <member-type access='public'>
           <!-- struct {hb_font_get_glyph_func_t glyph; hb_font_get_glyph_h_advance_func_t glyph_h_advance; hb_font_get_glyph_v_advance_func_t glyph_v_advance; hb_font_get_glyph_h_origin_func_t glyph_h_origin; hb_font_get_glyph_v_origin_func_t glyph_v_origin; hb_font_get_glyph_h_kerning_func_t glyph_h_kerning; hb_font_get_glyph_v_kerning_func_t glyph_v_kerning; hb_font_get_glyph_extents_func_t glyph_extents; hb_font_get_glyph_contour_point_func_t glyph_contour_point; hb_font_get_glyph_name_func_t glyph_name; hb_font_get_glyph_from_name_func_t glyph_from_name;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-191'>
@@ -4110,7 +4083,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {void* glyph; void* glyph_h_advance; void* glyph_v_advance; void* glyph_h_origin; void* glyph_v_origin; void* glyph_h_kerning; void* glyph_v_kerning; void* glyph_extents; void* glyph_contour_point; void* glyph_name; void* glyph_from_name;} -->
           <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-203'>
@@ -4160,7 +4132,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {hb_destroy_func_t glyph; hb_destroy_func_t glyph_h_advance; hb_destroy_func_t glyph_v_advance; hb_destroy_func_t glyph_h_origin; hb_destroy_func_t glyph_v_origin; hb_destroy_func_t glyph_h_kerning; hb_destroy_func_t glyph_v_kerning; hb_destroy_func_t glyph_extents; hb_destroy_func_t glyph_contour_point; hb_destroy_func_t glyph_name; hb_destroy_func_t glyph_from_name;} -->
           <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-204'>
@@ -4290,7 +4261,6 @@ 
     </class-decl>
     <!-- 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-210'>
-
         <member-type access='public'>
           <!-- struct hb_face_t::plan_node_t -->
           <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-211'>
@@ -4976,7 +4946,6 @@ 
       </class-decl>
       <!-- struct OT::hb_sanitize_context_t -->
       <class-decl name='hb_sanitize_context_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-279'>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_sanitize_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-369'/>
@@ -8815,7 +8784,6 @@ 
       <typedef-decl name='OpenTypeFontFace' type-id='type-id-263' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-328'/>
       <!-- struct OT::TTCHeader -->
       <class-decl name='TTCHeader' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-272'>
-
           <member-type access='protected'>
             <!-- union {struct {OT::Tag ttcTag; OT::FixedVersion version;} header; OT::TTCHeaderVersion1 version1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-566'>
@@ -8943,7 +8911,6 @@ 
       </class-decl>
       <!-- struct OT::OpenTypeFontFile -->
       <class-decl name='OpenTypeFontFile' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-268'>
-
           <member-type access='protected'>
             <!-- union {OT::Tag tag; OT::OpenTypeFontFace fontFace; OT::TTCHeader ttcHeader;} -->
             <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-571'>
@@ -9345,7 +9312,6 @@ 
   <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'>
     <!-- int* -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-572'/>
-
     <!-- 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* -->
@@ -10935,73 +10901,60 @@ 
     </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'>
-
-
     <!-- BYTE[256] -->
     <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='2048' id='type-id-668'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-4' id='type-id-669'/>
-
     </array-type-def>
     <!-- CmapSubtableLongGroup[1] -->
     <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='96' id='type-id-671'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- EncodingRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-672' size-in-bits='64' id='type-id-673'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- IntType<short unsigned int, 2u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-257' size-in-bits='16' id='type-id-674'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- LongMetric[1] -->
     <array-type-def dimensions='1' type-id='type-id-675' size-in-bits='32' id='type-id-676'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- SHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-564' size-in-bits='16' id='type-id-677'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- USHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-528' size-in-bits='16' id='type-id-678'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- UVSMapping[1] -->
     <array-type-def dimensions='1' type-id='type-id-679' size-in-bits='40' id='type-id-680'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
     <array-type-def dimensions='1' type-id='type-id-681' size-in-bits='32' id='type-id-682'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- VariationSelectorRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-683' size-in-bits='88' id='type-id-684'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- uint8_t[3] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-685'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <!-- struct hb_ot_face_cmap_accelerator_t -->
     <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-687'>
@@ -11615,7 +11568,6 @@ 
       </class-decl>
       <!-- struct OT::CmapSubtable -->
       <class-decl name='CmapSubtable' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-710'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CmapSubtableFormat0 format0; OT::CmapSubtableFormat4 format4; OT::CmapSubtableFormat6 format6; OT::CmapSubtableFormat10 format10; OT::CmapSubtableFormat12 format12; OT::CmapSubtableFormat13 format13; OT::CmapSubtableFormat14 format14;} -->
             <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-823'>
@@ -14124,254 +14076,211 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- EntryExitRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='32' id='type-id-841'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Index[1] -->
     <array-type-def dimensions='1' type-id='type-id-842' size-in-bits='16' id='type-id-843'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-732' size-in-bits='24' id='type-id-844'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- LookupRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-845' size-in-bits='32' id='type-id-846'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- MarkRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-847' size-in-bits='32' id='type-id-848'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-849' size-in-bits='16' id='type-id-850'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-851' size-in-bits='16' id='type-id-852'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-853' size-in-bits='16' id='type-id-854'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </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-855' size-in-bits='16' id='type-id-856'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-857' size-in-bits='16' id='type-id-858'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='16' id='type-id-860'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-861' size-in-bits='16' id='type-id-862'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-863' size-in-bits='16' id='type-id-864'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-865' size-in-bits='32' id='type-id-866'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-867' size-in-bits='16' id='type-id-868'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-869' size-in-bits='16' id='type-id-870'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-871' size-in-bits='16' id='type-id-872'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-873' size-in-bits='16' id='type-id-874'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-875' size-in-bits='16' id='type-id-876'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-877' size-in-bits='16' id='type-id-878'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-879' size-in-bits='16' id='type-id-880'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-882'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-883' size-in-bits='16' id='type-id-884'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-885' size-in-bits='16' id='type-id-886'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-887' size-in-bits='16' id='type-id-888'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-889' size-in-bits='16' id='type-id-890'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-891' size-in-bits='16' id='type-id-892'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- RangeRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-893' size-in-bits='48' id='type-id-894'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
     <array-type-def dimensions='1' type-id='type-id-895' size-in-bits='48' id='type-id-896'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
     <array-type-def dimensions='1' type-id='type-id-897' size-in-bits='48' id='type-id-898'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
     <array-type-def dimensions='1' type-id='type-id-899' size-in-bits='48' id='type-id-900'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Value[1] -->
     <array-type-def dimensions='1' type-id='type-id-901' size-in-bits='16' id='type-id-902'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-903'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- feature_map_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='2304' id='type-id-905'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- lookup_map_t[32] -->
     <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='2048' id='type-id-907'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <!-- stage_map_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='512' id='type-id-910'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-911' size-in-bits='4352' id='type-id-912'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-913' size-in-bits='1280' id='type-id-914'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- hb_tag_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='64' id='type-id-915'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- void*[3] -->
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='192' id='type-id-916'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <!-- struct hb_ot_map_t -->
     <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-917'>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::stage_map_t -->
           <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-909'>
-
               <member-type access='public'>
                 <!-- typedef void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* hb_ot_map_t::stage_map_t::pause_func_t -->
                 <typedef-decl name='pause_func_t' type-id='type-id-919' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-918'/>
@@ -14386,7 +14295,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::lookup_map_t -->
           <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-906'>
@@ -14415,7 +14323,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::feature_map_t -->
           <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-904'>
@@ -15676,7 +15583,6 @@ 
     </class-decl>
     <!-- struct GSUBProxy -->
     <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-978'>
-
         <member-type access='public'>
           <!-- typedef OT::SubstLookup GSUBProxy::Lookup -->
           <typedef-decl name='Lookup' type-id='type-id-980' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-979'/>
@@ -15711,7 +15617,6 @@ 
     </class-decl>
     <!-- struct GPOSProxy -->
     <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-985'>
-
         <member-type access='public'>
           <!-- typedef OT::PosLookup GPOSProxy::Lookup -->
           <typedef-decl name='Lookup' type-id='type-id-987' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-986'/>
@@ -17393,7 +17298,6 @@ 
     <namespace-decl name='OT'>
       <!-- struct OT::CoverageFormat1 -->
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1118'>
-
           <member-type access='public'>
             <!-- struct OT::CoverageFormat1::Iter -->
             <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1119'>
@@ -17559,7 +17463,6 @@ 
       </class-decl>
       <!-- struct OT::CoverageFormat2 -->
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1121'>
-
           <member-type access='public'>
             <!-- struct OT::CoverageFormat2::Iter -->
             <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1122'>
@@ -17733,11 +17636,9 @@ 
       </class-decl>
       <!-- struct OT::hb_apply_context_t -->
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1375'>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::matcher_t -->
             <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1377'>
-
                 <member-type access='public'>
                   <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
                   <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1810'>
@@ -17747,7 +17648,6 @@ 
                     <enumerator name='MATCH_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
                   <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1811'>
@@ -17757,7 +17657,6 @@ 
                     <enumerator name='SKIP_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
                   <typedef-decl name='match_func_t' type-id='type-id-1394' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1812'/>
@@ -17895,7 +17794,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
             <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1379'>
@@ -18002,7 +17900,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
             <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1381'>
@@ -18113,12 +18010,10 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1801' 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-1813'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_apply_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1814'/>
@@ -19323,7 +19218,6 @@ 
       </class-decl>
       <!-- struct OT::FeatureParams -->
       <class-decl name='FeatureParams' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1142'>
-
           <member-type access='private'>
             <!-- union {OT::FeatureParamsSize size; OT::FeatureParamsStylisticSet stylisticSet; OT::FeatureParamsCharacterVariants characterVariants;} -->
             <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1815'>
@@ -19755,11 +19649,9 @@ 
       </class-decl>
       <!-- struct OT::Coverage -->
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1115'>
-
           <member-type access='public'>
             <!-- struct OT::Coverage::Iter -->
             <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1116'>
-
                 <member-type access='private'>
                   <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} -->
                   <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1816'>
@@ -19839,7 +19731,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1817'>
@@ -20468,7 +20359,6 @@ 
       </class-decl>
       <!-- struct OT::ClassDef -->
       <class-decl name='ClassDef' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1094'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ClassDefFormat1 format1; OT::ClassDefFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1818'>
@@ -21694,7 +21584,6 @@ 
       </class-decl>
       <!-- struct OT::CaretValue -->
       <class-decl name='CaretValue' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1065'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CaretValueFormat1 format1; OT::CaretValueFormat2 format2; OT::CaretValueFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1822'>
@@ -22002,7 +21891,6 @@ 
       </class-decl>
       <!-- struct OT::MarkGlyphSets -->
       <class-decl name='MarkGlyphSets' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1186'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkGlyphSetsFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1823'>
@@ -22690,7 +22578,6 @@ 
       </class-decl>
       <!-- struct OT::Anchor -->
       <class-decl name='Anchor' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-995'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::AnchorFormat1 format1; OT::AnchorFormat2 format2; OT::AnchorFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1826'>
@@ -23825,12 +23712,10 @@ 
       </class-decl>
       <!-- struct OT::hb_closure_context_t -->
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1383'>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1803' 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-1829'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1830'/>
@@ -24171,12 +24056,10 @@ 
       </class-decl>
       <!-- struct OT::hb_collect_glyphs_context_t -->
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1385'>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1805' 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-1831'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1832'/>
@@ -24643,7 +24526,6 @@ 
       </class-decl>
       <!-- struct OT::hb_would_apply_context_t -->
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1389'>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1834'/>
@@ -28593,7 +28475,6 @@ 
       <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1373'>
       <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
-
           <member-type access='public'>
             <!-- enum OT::ValueFormat::Flags -->
             <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1854'>
@@ -29696,7 +29577,6 @@ 
       </class-decl>
       <!-- struct OT::PairSet -->
       <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1259'>
-
           <member-type access='public'>
             <!-- struct OT::PairSet::sanitize_closure_t -->
             <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1262'>
@@ -29982,7 +29862,6 @@ 
       </class-decl>
       <!-- struct OT::SubstLookupSubTable -->
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1310'>
-
           <member-type access='public'>
             <!-- enum OT::SubstLookupSubTable::Type -->
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1856'>
@@ -29997,7 +29876,6 @@ 
               <enumerator name='ReverseChainSingle' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1857'>
@@ -30146,7 +30024,6 @@ 
       </class-decl>
       <!-- struct OT::SingleSubst -->
       <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1305'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1862'>
@@ -30254,7 +30131,6 @@ 
       </class-decl>
       <!-- struct OT::hb_get_coverage_context_t -->
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1387'>
-
           <member-type access='public'>
             <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-966' 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-1861'/>
@@ -30515,7 +30391,6 @@ 
       </class-decl>
       <!-- struct OT::GDEF -->
       <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1151'>
-
           <member-type access='public'>
             <!-- enum OT::GDEF::GlyphClasses -->
             <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1863'>
@@ -30971,7 +30846,6 @@ 
       <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
       <!-- struct OT::MultipleSubst -->
       <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1201'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1864'>
@@ -31077,7 +30951,6 @@ 
       </class-decl>
       <!-- struct OT::AlternateSubst -->
       <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-991'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1865'>
@@ -31183,7 +31056,6 @@ 
       </class-decl>
       <!-- struct OT::LigatureSubst -->
       <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1173'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1866'>
@@ -31298,7 +31170,6 @@ 
       </class-decl>
       <!-- struct OT::Context -->
       <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1101'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1867'>
@@ -31398,7 +31269,6 @@ 
       </class-decl>
       <!-- struct OT::ChainContext -->
       <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1074'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1868'>
@@ -31692,7 +31562,6 @@ 
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubst -->
       <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1283'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1870'>
@@ -31864,7 +31733,6 @@ 
       </class-decl>
       <!-- struct OT::PosLookupSubTable -->
       <class-decl name='PosLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1266'>
-
           <member-type access='public'>
             <!-- enum OT::PosLookupSubTable::Type -->
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1871'>
@@ -31880,7 +31748,6 @@ 
               <enumerator name='Extension' value='9'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {struct {OT::USHORT sub_format;} header; OT::SinglePos single; OT::PairPos pair; OT::CursivePos cursive; OT::MarkBasePos markBase; OT::MarkLigPos markLig; OT::MarkMarkPos markMark; OT::ContextPos context; OT::ChainContextPos chainContext; OT::ExtensionPos extension;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1872'>
@@ -32007,7 +31874,6 @@ 
       </class-decl>
       <!-- struct OT::SinglePos -->
       <class-decl name='SinglePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1299'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::SinglePosFormat1 format1; OT::SinglePosFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1877'>
@@ -32076,7 +31942,6 @@ 
       </class-decl>
       <!-- struct OT::PairPos -->
       <class-decl name='PairPos' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1253'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::PairPosFormat1 format1; OT::PairPosFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1878'>
@@ -32145,7 +32010,6 @@ 
       </class-decl>
       <!-- struct OT::CursivePos -->
       <class-decl name='CursivePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1124'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CursivePosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1879'>
@@ -32210,7 +32074,6 @@ 
       </class-decl>
       <!-- struct OT::MarkBasePos -->
       <class-decl name='MarkBasePos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkBasePosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1880'>
@@ -32275,7 +32138,6 @@ 
       </class-decl>
       <!-- struct OT::MarkLigPos -->
       <class-decl name='MarkLigPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1191'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkLigPosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1881'>
@@ -32340,7 +32202,6 @@ 
       </class-decl>
       <!-- struct OT::MarkMarkPos -->
       <class-decl name='MarkMarkPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1195'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkMarkPosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1882'>
@@ -32420,7 +32281,6 @@ 
       </class-decl>
       <!-- struct OT::Extension<OT::ExtensionPos> -->
       <class-decl name='Extension&lt;OT::ExtensionPos&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1133'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1883'>
@@ -35855,23 +35715,19 @@ 
     <array-type-def dimensions='1' type-id='type-id-1888' size-in-bits='7168' id='type-id-1889'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <!-- stage_info_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-1890' size-in-bits='1024' id='type-id-1891'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-1892' size-in-bits='2304' id='type-id-1893'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- struct hb_ot_map_builder_t -->
     <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1894'>
-
         <member-type access='private'>
           <!-- struct hb_ot_map_builder_t::feature_info_t -->
           <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1888'>
@@ -35912,7 +35768,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct hb_ot_map_builder_t::stage_info_t -->
           <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1890'>
@@ -36341,7 +36196,6 @@ 
     <pointer-type-def type-id='type-id-1897' size-in-bits='64' id='type-id-1901'/>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>* -->
     <pointer-type-def type-id='type-id-1892' size-in-bits='64' id='type-id-1906'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
@@ -36394,27 +36248,20 @@ 
     <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1838'/>
     <!-- const unsigned int* -->
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-1836'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- hb_mask_t[21] -->
     <array-type-def dimensions='1' type-id='type-id-101' size-in-bits='672' id='type-id-1917'>
       <!-- <anonymous range>[21] -->
       <subrange length='21' type-id='type-id-4' id='type-id-1918'/>
-
     </array-type-def>
     <!-- struct indic_shape_plan_t -->
     <class-decl name='indic_shape_plan_t' size-in-bits='1344' 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='507' column='1' id='type-id-1919'>
@@ -36605,32 +36452,24 @@ 
     <pointer-type-def type-id='type-id-1933' size-in-bits='64' id='type-id-1930'/>
     <!-- would_substitute_feature_t* -->
     <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1929'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- char[8] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1934'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- struct hb_ot_complex_shaper_t -->
     <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-1935'>
@@ -36832,7 +36671,6 @@ 
     <pointer-type-def type-id='type-id-1956' size-in-bits='64' id='type-id-1936'/>
     <!-- void* (const hb_ot_shape_plan_t*)* -->
     <pointer-type-def type-id='type-id-1957' size-in-bits='64' id='type-id-1937'/>
-
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
@@ -36948,16 +36786,13 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- elt_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1958' size-in-bits='65536' id='type-id-1959'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-4' id='type-id-1960'/>
-
     </array-type-def>
     <!-- struct hb_set_t -->
     <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-1961'>
-
         <member-type access='public'>
           <!-- typedef uint32_t hb_set_t::elt_t -->
           <typedef-decl name='elt_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1958'/>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index d5ab3e3d..0af4ac26 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -867,10 +867,6 @@ 
     <elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -879,25 +875,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[40] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
@@ -928,7 +920,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='128' id='type-id-18'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-19'/>
@@ -2359,7 +2350,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-86' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-87'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-86'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <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-88'>
@@ -2530,7 +2520,6 @@ 
     </class-decl>
     <!-- class vtkWeakPointerBase -->
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-75'>
-
         <member-type access='protected'>
           <!-- class vtkWeakPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-91'/>
@@ -2660,7 +2649,6 @@ 
     </class-decl>
     <!-- class vtkPixelTransfer -->
     <class-decl name='vtkPixelTransfer' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.h' line='35' column='1' id='type-id-104'>
-
         <member-type access='private'>
           <!-- typedef double vtkPixelTransfer::VTK_TT -->
           <typedef-decl name='VTK_TT' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' line='19' column='1' id='type-id-105'/>
@@ -3448,10 +3436,8 @@ 
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ios_base -->
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-219'>
-
           <member-type access='private'>
             <!-- class std::ios_base::Init -->
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-221'>
@@ -3608,7 +3594,6 @@ 
       </class-decl>
       <!-- struct std::_Resetiosflags -->
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-262'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Fmtflags std::_Resetiosflags::fmtflags -->
             <typedef-decl name='fmtflags' type-id='type-id-263' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-149'/>
@@ -3643,7 +3628,6 @@ 
       </enum-decl>
       <!-- struct std::basic_ios<char, std::char_traits<char> > -->
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-164'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Iostate std::basic_ios<char, std::char_traits<char> >::iostate -->
             <typedef-decl name='iostate' type-id='type-id-264' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-167'/>
@@ -3711,12 +3695,10 @@ 
       </enum-decl>
       <!-- class std::__basic_file<char> -->
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-151'>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Openmode std::__basic_file<char>::openmode -->
             <typedef-decl name='openmode' type-id='type-id-265' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-154'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Seekdir std::__basic_file<char>::seekdir -->
             <typedef-decl name='seekdir' type-id='type-id-266' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-156'/>
@@ -5214,12 +5196,10 @@ 
       </class-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-280'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-169'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-17' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-173'/>
@@ -5379,7 +5359,6 @@ 
       </class-decl>
       <!-- class std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> > -->
       <class-decl name='_Deque_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-142'>
-
           <member-type access='protected'>
             <!-- enum std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-281'>
@@ -5387,7 +5366,6 @@ 
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- struct std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::_Deque_impl -->
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-200'>
@@ -6674,7 +6652,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-22'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -6935,7 +6912,6 @@ 
       <!-- int -->
       <return type-id='type-id-17'/>
     </function-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -7487,7 +7463,6 @@ 
     </class-decl>
     <!-- class vtkDataObject -->
     <class-decl name='vtkDataObject' visibility='default' is-declaration-only='yes' id='type-id-235'>
-
         <member-type access='private'>
           <!-- enum vtkDataObject::FieldAssociations -->
           <enum-decl name='FieldAssociations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/DataModel/vtkDataObject.h' line='212' column='1' id='type-id-287'>
@@ -7616,7 +7591,6 @@ 
     </class-decl>
     <!-- class vtkOStreamWrapper -->
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-289'>
-
         <member-type access='private'>
           <!-- struct vtkOStreamWrapper::EndlType -->
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-184'/>
@@ -7881,7 +7855,6 @@ 
     </class-decl>
     <!-- class vtkTextureObject -->
     <class-decl name='vtkTextureObject' visibility='default' is-declaration-only='yes' id='type-id-290'>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='88' column='1' id='type-id-291'>
@@ -7894,7 +7867,6 @@ 
             <enumerator name='NumberOfDepthFormats' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='65' column='1' id='type-id-292'>
@@ -7907,7 +7879,6 @@ 
             <enumerator name='NumberOfWrapModes' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='76' column='1' id='type-id-293'>
@@ -7984,7 +7955,6 @@ 
     </class-decl>
     <!-- class vtkPixelBufferObject -->
     <class-decl name='vtkPixelBufferObject' visibility='default' is-declaration-only='yes' id='type-id-247'>
-
         <member-type access='private'>
           <!-- enum vtkPixelBufferObject::BufferType -->
           <enum-decl name='BufferType' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkPixelBufferObject.h' line='265' column='1' id='type-id-295'>
@@ -8057,7 +8027,6 @@ 
     </class-decl>
     <!-- class vtkDataArrayTemplate<float> -->
     <class-decl name='vtkDataArrayTemplate&lt;float&gt;' visibility='default' is-declaration-only='yes' id='type-id-233'>
-
         <member-type access='private'>
           <!-- enum vtkDataArrayTemplate<float>::DeleteMethod -->
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-296'>
@@ -8105,8 +8074,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <!-- class vtkImageNoiseSource -->
     <class-decl name='vtkImageNoiseSource' visibility='default' is-declaration-only='yes' id='type-id-241'/>
     <!-- class vtkInformationVector -->
@@ -8139,12 +8106,10 @@ 
     <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-258'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <!-- int[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-63'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-4' id='type-id-297'/>
-
     </array-type-def>
     <!-- class vtkWeakPointer<vtkImageDataLIC2D> -->
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-65'>
@@ -8308,10 +8273,8 @@ 
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-298'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ctype<char> -->
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-302'>
-
           <member-type access='private'>
             <!-- typedef char std::ctype<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-309'/>
@@ -8350,9 +8313,6 @@ 
         <return type-id='type-id-214'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&) -->
     <function-type size-in-bits='64' id='type-id-308'>
       <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >&' -->
@@ -8362,30 +8322,25 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-310'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='256' id='type-id-312'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- unsigned int*[2] -->
     <array-type-def dimensions='1' type-id='type-id-56' size-in-bits='128' id='type-id-313'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='64' id='type-id-314'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- class vtkPainterCommunicator -->
     <class-decl name='vtkPainterCommunicator' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPainterCommunicator.h' line='30' column='1' id='type-id-315'>
@@ -8523,7 +8478,6 @@ 
     <class-decl name='vtkLineIntegralConvolution2D' size-in-bits='1792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='105' column='1' id='type-id-320'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-286'/>
-
         <member-type access='private'>
           <!-- enum vtkLineIntegralConvolution2D::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='149' column='1' id='type-id-321'>
@@ -10132,7 +10086,6 @@ 
     <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-325'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- ptrdiff_t std::operator&#45;<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>(const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&, const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&) -->
       <function-decl name='operator-&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&' -->
@@ -10512,7 +10465,6 @@ 
       </function-decl>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-373'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-423'>
@@ -10530,7 +10482,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-377'>
@@ -10683,7 +10634,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-405'>
@@ -12414,7 +12364,6 @@ 
       <typedef-decl name='string' type-id='type-id-373' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-428'/>
       <!-- struct std::_Vector_base<vtkPixelBufferObject*, std::allocator<vtkPixelBufferObject*> > -->
       <class-decl name='_Vector_base&lt;vtkPixelBufferObject*, std::allocator&lt;vtkPixelBufferObject*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-355'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkPixelBufferObject*, std::allocator<vtkPixelBufferObject*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-394'>
@@ -13110,7 +13059,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<float, std::allocator<float> > -->
       <class-decl name='_Vector_base&lt;float, std::allocator&lt;float&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-352'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<float, std::allocator<float> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-391'>
@@ -14452,8 +14400,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const float*, std::vector<float, std::allocator<float> > > -->
       <class-decl name='__normal_iterator&lt;const float*, std::vector&lt;float, std::allocator&lt;float&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-437'/>
     </namespace-decl>
-
-
     <!-- namespace vtkLineIntegralConvolution2DUtil -->
     <namespace-decl name='vtkLineIntegralConvolution2DUtil'>
       <!-- const char* vtkLineIntegralConvolution2DUtil::GetVectorLookupProgram(int) -->
@@ -14526,15 +14472,10 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- vtkPixelTransfer::VTK_TT* -->
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkStructuredGridLIC2D -->
@@ -15042,9 +14983,6 @@ 
     <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-453'/>
     <!-- vtkStructuredGridLIC2D* -->
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-451'/>
-
-
-
     <!-- namespace detail -->
     <namespace-decl name='detail'>
       <!-- class detail::vtkAtomicIntImpl<int> -->
@@ -15168,8 +15106,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkSurfaceLICComposite -->
@@ -15716,7 +15652,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-475'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::operator==<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>(const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&, const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&) -->
       <function-decl name='operator==&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&' -->
@@ -16588,8 +16523,6 @@ 
         <return type-id='type-id-46'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkSurfaceLICDefaultPainter -->
@@ -16855,7 +16788,6 @@ 
     <class-decl name='vtkSurfaceLICPainter' size-in-bits='2880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='67' column='1' id='type-id-504'>
     <!-- class vtkPainter -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-505'/>
-
         <member-type access='private'>
           <!-- enum vtkSurfaceLICPainter::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-506'>
@@ -16866,7 +16798,6 @@ 
             <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkSurfaceLICPainter::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-507'>
@@ -16877,7 +16808,6 @@ 
             <enumerator name='COMPOSITE_AUTO' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='protected'>
           <!-- class vtkSurfaceLICPainter::vtkInternals -->
           <class-decl name='vtkInternals' size-in-bits='3392' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='824' column='1' id='type-id-508'>
@@ -18710,13 +18640,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-500' size-in-bits='64' id='type-id-503'/>
     <!-- vtkTimeStamp* -->
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-501'/>
-
-
-
-
     <!-- class vtkPainter -->
     <class-decl name='vtkPainter' visibility='default' is-declaration-only='yes' id='type-id-505'>
-
         <member-type access='private'>
           <!-- enum vtkPainter::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/Core/vtkPainter.h' line='100' column='1' id='type-id-551'>
@@ -18951,13 +18876,10 @@ 
     <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-549'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
     <!-- double[3] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-524'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-552'/>
-
     </array-type-def>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-553'/>
@@ -18965,13 +18887,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-554' size-in-bits='512' id='type-id-509'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-555'/>
-
     </array-type-def>
     <!-- typedef float GLfloat -->
     <typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-556'/>
     <!-- class vtkSmartPointerBase -->
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-557'>
-
         <member-type access='protected'>
           <!-- class vtkSmartPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-558'/>
@@ -21882,7 +21802,6 @@ 
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-528'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- vtkPixelExtent* std::uninitialized_copy<std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, vtkPixelExtent*>(std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, vtkPixelExtent*) -->
       <function-decl name='uninitialized_copy&lt;std::_Deque_iterator&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'struct std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>' -->
@@ -21938,7 +21857,6 @@ 
       </function-decl>
       <!-- struct std::_Vector_base<vtkPixelExtent, std::allocator<vtkPixelExtent> > -->
       <class-decl name='_Vector_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-630'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
@@ -22632,8 +22550,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const vtkPixelExtent*, std::vector<vtkPixelExtent, std::allocator<vtkPixelExtent> > > -->
       <class-decl name='__normal_iterator&lt;const vtkPixelExtent*, std::vector&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-686'/>
     </namespace-decl>
-
-
     <!-- namespace vtkSurfaceLICPainterUtil -->
     <namespace-decl name='vtkSurfaceLICPainterUtil'>
       <!-- int vtkSurfaceLICPainterUtil::ilog2(unsigned int) -->
@@ -22756,7 +22672,6 @@ 
       </class-decl>
       <!-- class vtkSurfaceLICPainterUtil::RandomNoise2D -->
       <class-decl name='RandomNoise2D' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='299' column='1' id='type-id-678'>
-
           <member-type access='private'>
             <!-- enum vtkSurfaceLICPainterUtil::RandomNoise2D::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='319' column='1' id='type-id-689'>
@@ -22926,7 +22841,6 @@ 
     </namespace-decl>
     <!-- class vtkLightingHelper -->
     <class-decl name='vtkLightingHelper' visibility='default' is-declaration-only='yes' id='type-id-671'>
-
         <member-type access='private'>
           <!-- enum vtkLightingHelper::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkLightingHelper.h' line='42' column='1' id='type-id-690'>
@@ -23114,8 +23028,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <!-- class vtkBackgroundColorMonitor -->
     <class-decl name='vtkBackgroundColorMonitor' visibility='default' is-declaration-only='yes' id='type-id-664'/>
     <!-- class vtkCellData -->
@@ -23165,10 +23077,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
     <!-- const char* vtkLineIntegralConvolution2D_AAH -->
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 5b1f7134..0b2acfcc 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1577,12 +1577,6 @@ 
     <elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
     <!-- int RunningOnValgrind() -->
@@ -1597,12 +1591,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- unsigned char[16] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-4'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-5' id='type-id-6'/>
-
     </array-type-def>
     <!-- struct Elf64_Sym -->
     <class-decl name='Elf64_Sym' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/elf.h' line='389' column='1' id='type-id-7'>
@@ -1837,10 +1829,8 @@ 
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-51'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
-
       <!-- class base::ElfMemImage -->
       <class-decl name='ElfMemImage' size-in-bits='576' visibility='default' filepath='./src/base/elf_mem_image.h' line='56' column='1' id='type-id-23'>
-
           <member-type access='private'>
             <!-- struct base::ElfMemImage::SymbolInfo -->
             <class-decl name='SymbolInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/base/elf_mem_image.h' line='64' column='1' id='type-id-25'>
@@ -1862,7 +1852,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- class base::ElfMemImage::SymbolIterator -->
             <class-decl name='SymbolIterator' size-in-bits='384' visibility='default' filepath='./src/base/elf_mem_image.h' line='73' column='1' id='type-id-27'>
@@ -2171,10 +2160,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- typedef int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* ListAllProcessThreadsCallBack -->
@@ -2187,7 +2172,6 @@ 
     <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-58'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-63'/>
-
     <!-- int TCMalloc_ListAllProcessThreads(void*, ListAllProcessThreadsCallBack, ...) -->
     <function-decl name='TCMalloc_ListAllProcessThreads' mangled-name='TCMalloc_ListAllProcessThreads' filepath='src/base/linuxthreads.cc' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='TCMalloc_ListAllProcessThreads'>
       <!-- parameter of type 'void*' -->
@@ -2222,10 +2206,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_verbose -->
@@ -2233,7 +2213,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_noverbose -->
       <var-decl name='FLAGS_noverbose' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE' visibility='default' filepath='src/base/logging.cc' line='40' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE'/>
     </namespace-decl>
-
     <!-- void RawClose(RawFD) -->
     <function-decl name='RawClose' mangled-name='_Z8RawClosei' filepath='src/base/logging.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8RawClosei'>
       <!-- parameter of type 'typedef RawFD' -->
@@ -2261,25 +2240,17 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- AllocList*[30] -->
     <array-type-def dimensions='1' type-id='type-id-68' size-in-bits='1920' id='type-id-69'>
       <!-- <anonymous range>[30] -->
       <subrange length='30' type-id='type-id-5' id='type-id-70'/>
-
     </array-type-def>
     <!-- low_level_alloc_internal::AllocList* -->
     <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-68'/>
-
-
-
-
-
     <!-- namespace low_level_alloc_internal -->
     <namespace-decl name='low_level_alloc_internal'>
       <!-- struct low_level_alloc_internal::AllocList -->
       <class-decl name='AllocList' size-in-bits='2240' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='67' column='1' id='type-id-71'>
-
           <member-type access='public'>
             <!-- struct low_level_alloc_internal::AllocList::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='68' column='1' id='type-id-72'>
@@ -2315,7 +2286,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- struct CycleClock -->
@@ -2330,8 +2300,6 @@ 
     </class-decl>
     <!-- namespace base -->
     <namespace-decl name='base'>
-
-
       <!-- void base::SubmitSpinLockProfileData(void*, int64) -->
       <function-decl name='SubmitSpinLockProfileData' mangled-name='_ZN4base25SubmitSpinLockProfileDataEPKvl' filepath='./src/base/synchronization_profiling.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base25SubmitSpinLockProfileDataEPKvl'>
         <!-- parameter of type 'void*' -->
@@ -2342,11 +2310,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const base::internal::SpinLockWaitTransition -->
@@ -2415,26 +2378,20 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- char[10] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='80' id='type-id-83'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-5' id='type-id-84'/>
-
     </array-type-def>
     <!-- char[5120] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='40960' id='type-id-85'>
       <!-- <anonymous range>[5120] -->
       <subrange length='5120' type-id='type-id-5' id='type-id-86'/>
-
     </array-type-def>
     <!-- class ProcMapsIterator -->
     <class-decl name='ProcMapsIterator' size-in-bits='640' visibility='default' filepath='./src/base/sysinfo.h' line='102' column='1' id='type-id-87'>
-
         <member-type access='private'>
           <!-- struct ProcMapsIterator::Buffer -->
           <class-decl name='Buffer' size-in-bits='40960' is-struct='yes' visibility='default' filepath='./src/base/sysinfo.h' line='104' column='1' id='type-id-88'>
@@ -2667,11 +2624,6 @@ 
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-98'/>
     <!-- uint64* -->
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-96'/>
-
-
-
-
-
     <!-- bool HasPosixThreads() -->
     <function-decl name='HasPosixThreads' mangled-name='_Z15HasPosixThreadsv' filepath='src/base/sysinfo.cc' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15HasPosixThreadsv'>
       <!-- bool -->
@@ -2717,7 +2669,6 @@ 
       <!-- const char* -->
       <return type-id='type-id-52'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- base::VDSOInitHelper* -->
@@ -2756,12 +2707,10 @@ 
       </class-decl>
       <!-- class base::VDSOSupport -->
       <class-decl name='VDSOSupport' size-in-bits='576' visibility='default' filepath='./src/base/vdso_support.h' line='72' column='1' id='type-id-104'>
-
           <member-type access='private'>
             <!-- typedef base::ElfMemImage::SymbolInfo base::VDSOSupport::SymbolInfo -->
             <typedef-decl name='SymbolInfo' type-id='type-id-25' filepath='./src/base/vdso_support.h' line='76' column='1' id='type-id-106'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef base::ElfMemImage::SymbolIterator base::VDSOSupport::SymbolIterator -->
             <typedef-decl name='SymbolIterator' type-id='type-id-27' filepath='./src/base/vdso_support.h' line='77' column='1' id='type-id-111'/>
@@ -2882,10 +2831,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const int& -->
@@ -2900,7 +2845,6 @@ 
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const int& std::max<int>(const int&, const int&) -->
       <function-decl name='max&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const int&' -->
@@ -2920,12 +2864,8 @@ 
         <return type-id='type-id-116'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
-
       <!-- bool tcmalloc::DLL_IsEmpty(const tcmalloc::Span*) -->
       <function-decl name='DLL_IsEmpty' filepath='src/span.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const tcmalloc::Span*' -->
@@ -2962,7 +2902,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class HeapLeakCheckerGlobalPrePost -->
@@ -2994,33 +2933,24 @@ 
     </class-decl>
     <!-- HeapLeakCheckerGlobalPrePost* -->
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-
-
-
-
     <!-- bool heap_leak_checker_bcad_variable -->
     <var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-55' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='infinite' id='type-id-123'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-124'/>
-
     </array-type-def>
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='256' id='type-id-125'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- void*[32] -->
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='2048' id='type-id-127'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <!-- struct AllocObject -->
     <class-decl name='AllocObject' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='356' column='1' id='type-id-129'>
@@ -3368,7 +3298,6 @@ 
     </class-decl>
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-151'>
-
         <member-type access='private'>
           <!-- typedef void ()* GoogleInitializer::VoidFunction -->
           <typedef-decl name='VoidFunction' type-id='type-id-153' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-152'/>
@@ -3410,7 +3339,6 @@ 
     </class-decl>
     <!-- class MemoryRegionMap -->
     <class-decl name='MemoryRegionMap' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='69' column='1' id='type-id-157'>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::RegionCmp -->
           <class-decl name='RegionCmp' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='245' column='1' id='type-id-158'>
@@ -3429,7 +3357,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::Region -->
           <class-decl name='Region' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='137' column='1' id='type-id-161'>
@@ -3550,7 +3477,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::MyAllocator -->
           <class-decl name='MyAllocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='252' column='1' id='type-id-164'>
@@ -3576,12 +3502,10 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > MemoryRegionMap::RegionSet -->
           <typedef-decl name='RegionSet' type-id='type-id-166' filepath='src/memory_region_map.h' line='263' column='1' id='type-id-165'/>
         </member-type>
-
         <member-type access='private'>
           <!-- union MemoryRegionMap::RegionSetRep -->
           <union-decl name='RegionSetRep' size-in-bits='384' visibility='default' filepath='src/memory_region_map.cc' line='177' column='1' id='type-id-167'>
@@ -3604,7 +3528,6 @@ 
             </member-function>
           </union-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class MemoryRegionMap::LockHolder -->
           <class-decl name='LockHolder' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='126' column='1' id='type-id-171'>
@@ -3652,7 +3575,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::_Rb_tree_const_iterator<MemoryRegionMap::Region> MemoryRegionMap::RegionIterator -->
           <typedef-decl name='RegionIterator' type-id='type-id-175' filepath='src/memory_region_map.h' line='268' column='1' id='type-id-174'/>
@@ -3971,11 +3893,9 @@ 
     </class-decl>
     <!-- class HeapProfileTable -->
     <class-decl name='HeapProfileTable' size-in-bits='832' visibility='default' filepath='src/heap-profile-table.h' line='51' column='1' id='type-id-187'>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocValue -->
           <class-decl name='AllocValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='190' column='1' id='type-id-188'>
-
               <member-type access='private'>
                 <!-- typedef HeapProfileBucket HeapProfileTable::AllocValue::Bucket -->
                 <typedef-decl name='Bucket' type-id='type-id-190' filepath='src/heap-profile-table.h' line='187' column='1' id='type-id-189'/>
@@ -4062,11 +3982,9 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::DumpArgs -->
           <class-decl name='DumpArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='242' column='1' id='type-id-194'>
-
               <member-type access='public'>
                 <!-- typedef HeapProfileStats HeapProfileTable::DumpArgs::Stats -->
                 <typedef-decl name='Stats' type-id='type-id-141' filepath='src/heap-profile-table.h' line='63' column='1' id='type-id-195'/>
@@ -4094,11 +4012,9 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::Snapshot -->
           <class-decl name='Snapshot' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='347' column='1' id='type-id-198'>
-
               <member-type access='private'>
                 <!-- struct HeapProfileTable::Snapshot::Entry -->
                 <class-decl name='Entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='514' column='1' id='type-id-199'>
@@ -4136,7 +4052,6 @@ 
                   </member-function>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <!-- struct HeapProfileTable::Snapshot::ReportState -->
                 <class-decl name='ReportState' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='528' column='1' id='type-id-203'>
@@ -4272,7 +4187,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AddNonLiveArgs -->
           <class-decl name='AddNonLiveArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='305' column='1' id='type-id-214'>
@@ -4286,7 +4200,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocInfo -->
           <class-decl name='AllocInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='66' column='1' id='type-id-215'>
@@ -4312,7 +4225,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocContextInfo -->
           <class-decl name='AllocContextInfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='77' column='1' id='type-id-216'>
@@ -4328,32 +4240,26 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void* (typedef size_t)* HeapProfileTable::Allocator -->
           <typedef-decl name='Allocator' type-id='type-id-217' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-209'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*)* HeapProfileTable::DeAllocator -->
           <typedef-decl name='DeAllocator' type-id='type-id-218' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-210'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef AddressMap<HeapProfileTable::AllocValue> HeapProfileTable::AllocationMap -->
           <typedef-decl name='AllocationMap' type-id='type-id-219' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-205'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const HeapProfileTable::AllocInfo&)* HeapProfileTable::AllocIterator -->
           <typedef-decl name='AllocIterator' type-id='type-id-221' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-220'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (const HeapProfileTable::AllocContextInfo&)* HeapProfileTable::AllocContextIterator -->
           <typedef-decl name='AllocContextIterator' type-id='type-id-223' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-222'/>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::BufferArgs -->
           <class-decl name='BufferArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='227' column='1' id='type-id-224'>
@@ -4809,7 +4715,6 @@ 
     </class-decl>
     <!-- class LowLevelAlloc -->
     <class-decl name='LowLevelAlloc' size-in-bits='8' visibility='default' filepath='src/base/low_level_alloc.h' line='44' column='1' id='type-id-237'>
-
         <member-type access='private'>
           <!-- struct LowLevelAlloc::Arena -->
           <class-decl name='Arena' size-in-bits='2560' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='184' column='1' id='type-id-238'>
@@ -4922,7 +4827,6 @@ 
     </class-decl>
     <!-- class HeapLeakChecker -->
     <class-decl name='HeapLeakChecker' size-in-bits='448' visibility='default' filepath='src/gperftools/heap-checker.h' line='78' column='1' id='type-id-239'>
-
         <member-type access='private'>
           <!-- class HeapLeakChecker::Disabler -->
           <class-decl name='Disabler' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='175' column='1' id='type-id-240'>
@@ -4970,7 +4874,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ShouldSymbolize -->
           <enum-decl name='ShouldSymbolize' filepath='./src/gperftools/heap-checker.h' line='225' column='1' id='type-id-243'>
@@ -4979,7 +4882,6 @@ 
             <enumerator name='DO_NOT_SYMBOLIZE' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ProcMapsTask -->
           <enum-decl name='ProcMapsTask' filepath='./src/gperftools/heap-checker.h' line='295' column='1' id='type-id-244'>
@@ -4988,7 +4890,6 @@ 
             <enumerator name='DISABLE_LIBRARY_ALLOCS' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ProcMapsResult -->
           <enum-decl name='ProcMapsResult' filepath='./src/gperftools/heap-checker.h' line='301' column='1' id='type-id-245'>
@@ -4998,7 +4899,6 @@ 
             <enumerator name='NO_SHARED_LIBS_IN_PROC_MAPS' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapLeakChecker::RangeValue -->
           <class-decl name='RangeValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='404' column='1' id='type-id-246'>
@@ -7182,7 +7082,6 @@ 
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-368' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-369'/>
     <!-- class HeapCleaner -->
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-370'>
-
         <member-type access='private'>
           <!-- typedef void ()* HeapCleaner::void_function -->
           <typedef-decl name='void_function' type-id='type-id-153' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-371'/>
@@ -8020,7 +7919,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::swap<AllocObject*>(AllocObject*&, AllocObject*&) -->
       <function-decl name='swap&lt;AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'AllocObject*&' -->
@@ -8519,7 +8417,6 @@ 
       </function-decl>
       <!-- class std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-555'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-665'>
@@ -8544,7 +8441,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-559'>
@@ -8697,7 +8593,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-719'>
@@ -10453,7 +10348,6 @@ 
       </function-decl>
       <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-543'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-653'>
@@ -11223,12 +11117,10 @@ 
       </class-decl>
       <!-- struct std::_Rb_tree_node_base -->
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-531'>
-
           <member-type access='public'>
             <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
             <typedef-decl name='_Base_ptr' type-id='type-id-650' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-730'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-533' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-731'/>
@@ -11438,7 +11330,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-478'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-630'>
@@ -12642,7 +12533,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-470'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-622'>
@@ -13811,7 +13701,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-466'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-618'>
@@ -14877,7 +14766,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-474'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-626'>
@@ -15966,7 +15854,6 @@ 
       <class-decl name='unary_function&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, const long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-752'/>
       <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-549'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
@@ -16166,7 +16053,6 @@ 
       <class-decl name='unary_function&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-754'/>
       <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> > -->
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-546'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-656'>
@@ -16308,12 +16194,10 @@ 
       </class-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-755'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-66' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-565'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-569'/>
@@ -20173,7 +20057,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<void* const*, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
       <class-decl name='__normal_iterator&lt;void* const*, std::vector&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-766'/>
     </namespace-decl>
-
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::internal -->
@@ -20347,7 +20230,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
     </namespace-decl>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
@@ -20421,7 +20303,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_noheap_check_max_pointer_offset -->
       <var-decl name='FLAGS_noheap_check_max_pointer_offset' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE' visibility='default' filepath='src/heap-checker.cc' line='209' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE'/>
     </namespace-decl>
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- namespace tcmalloc::commandlineflags -->
@@ -20717,7 +20598,6 @@ 
     <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-277'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::__equal_aux<const void* const*, const void**>(void* const*, void* const*, void**) -->
       <function-decl name='__equal_aux&lt;const void* const*, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void* const*' -->
@@ -21224,7 +21104,6 @@ 
       </function-decl>
       <!-- class std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
       <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-805'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-843'>
@@ -23291,8 +23170,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_heap_check_max_leaks -->
@@ -23313,7 +23190,6 @@ 
         <!-- int -->
         <return type-id='type-id-1'/>
       </function-decl>
-
     </namespace-decl>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
@@ -23413,11 +23289,6 @@ 
     </class-decl>
     <!-- HeapProfileEndWriter* -->
     <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-883'/>
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <!-- int64 FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_heap_profile_allocation_interval -->
@@ -23452,8 +23323,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_noonly_mmap_profile -->
       <var-decl name='FLAGS_noonly_mmap_profile' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE' visibility='default' filepath='src/heap-profiler.cc' line='125' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE'/>
     </namespace-decl>
-
-
     <!-- void HeapProfilerDump(const char*) -->
     <function-decl name='HeapProfilerDump' mangled-name='HeapProfilerDump' filepath='src/heap-profiler.cc' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='HeapProfilerDump'>
       <!-- parameter of type 'const char*' -->
@@ -23485,12 +23354,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- char[200] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='1600' id='type-id-884'>
       <!-- <anonymous range>[200] -->
       <subrange length='200' type-id='type-id-5' id='type-id-885'/>
-
     </array-type-def>
     <!-- const tcmalloc::LogItem -->
     <qualified-type-def type-id='type-id-886' const='yes' id='type-id-887'/>
@@ -23561,11 +23428,6 @@ 
       <!-- void (const char*, int)* tcmalloc::log_message_writer -->
       <var-decl name='log_message_writer' type-id='type-id-892' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
     </namespace-decl>
-
-
-
-
-
     <!-- void (const char*, int) -->
     <function-type size-in-bits='64' id='type-id-891'>
       <!-- parameter of type 'const char*' -->
@@ -23588,12 +23450,6 @@ 
     <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-259'/>
     <!-- MallocExtension::RangeFunction* -->
     <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-
-
-
-
-
-
     <!-- MallocExtension_Ownership MallocExtension_GetOwnership(void*) -->
     <function-decl name='MallocExtension_GetOwnership' mangled-name='MallocExtension_GetOwnership' filepath='src/malloc_extension.cc' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_GetOwnership'>
       <!-- parameter of type 'void*' -->
@@ -23703,7 +23559,6 @@ 
     </function-decl>
     <!-- class MallocExtension -->
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <!-- enum MallocExtension::Ownership -->
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
@@ -23713,7 +23568,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MallocExtension::FreeListInfo -->
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
@@ -23735,7 +23589,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
@@ -24116,7 +23969,6 @@ 
     <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void** std::__copy_move_a<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void**' -->
@@ -24151,8 +24003,6 @@ 
         <return type-id='type-id-120'/>
       </function-decl>
     </namespace-decl>
-
-
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::internal -->
@@ -24618,8 +24468,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
-
     <!-- void* mmap(void*, size_t, int, int, int, off_t) -->
     <function-decl name='mmap' mangled-name='mmap' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap'>
       <!-- parameter of type 'void*' -->
@@ -24977,10 +24825,6 @@ 
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
-
-
-
-
     <!-- int perftools_pthread_once(pthread_once_t*, void ()*) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
@@ -25101,12 +24945,6 @@ 
     </class-decl>
     <!-- HugetlbSysAllocator* -->
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
-
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead'>
       <!-- std::string FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead::FLAGS_memfs_malloc_path -->
@@ -25136,7 +24974,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_nomemfs_malloc_map_private -->
       <var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
     </namespace-decl>
-
     <!-- class SysAllocator -->
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
@@ -25181,16 +25018,13 @@ 
     <array-type-def dimensions='1' type-id='type-id-190' size-in-bits='8960' id='type-id-179'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <!-- void*[20][32] -->
     <array-type-def dimensions='2' type-id='type-id-53' size-in-bits='40960' id='type-id-180'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <!-- class STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
     <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
@@ -25559,7 +25393,6 @@ 
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-184'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::__equal_aux<const void**, const void**>(void**, void**, void**) -->
       <function-decl name='__equal_aux&lt;const void**, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void**' -->
@@ -25936,7 +25769,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
       <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-979'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> -->
             <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-990'>
@@ -26922,11 +26754,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- namespace base -->
     <namespace-decl name='base'>
-
       <!-- namespace base::subtle -->
       <namespace-decl name='subtle'>
         <!-- Atomic32 base::subtle::NoBarrier_Load(const volatile Atomic32*) -->
@@ -26938,7 +26767,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
     <!-- void (const MemoryRegionMap::Region&) -->
     <function-type size-in-bits='64' id='type-id-998'>
       <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -26948,10 +26776,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- namespace tcmalloc::commandlineflags -->
@@ -27009,7 +26833,6 @@ 
     <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1010'/>
     <!-- class ProfileHandler -->
     <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1011'>
-
         <member-type access='private'>
           <!-- enum ProfileHandler::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1012'>
@@ -27020,12 +26843,10 @@ 
             <enumerator name='TIMERS_SEPARATE' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > ProfileHandler::CallbackList -->
           <typedef-decl name='CallbackList' type-id='type-id-1014' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1013'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::_List_iterator<ProfileHandlerToken*> ProfileHandler::CallbackIterator -->
           <typedef-decl name='CallbackIterator' type-id='type-id-1016' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1015'/>
@@ -27384,10 +27205,8 @@ 
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1009'/>
     <!-- void (int, siginfo_t*, void*, void*)* -->
     <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1005'/>
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
       <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1016'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -28086,7 +27905,6 @@ 
       </class-decl>
       <!-- class std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
       <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1040'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1060'>
@@ -28553,9 +28371,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <!-- void ProfileHandlerGetState(ProfileHandlerState*) -->
     <function-decl name='ProfileHandlerGetState' mangled-name='ProfileHandlerGetState' filepath='src/profile-handler.cc' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerGetState'>
       <!-- parameter of type 'ProfileHandlerState*' -->
@@ -28604,41 +28419,30 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- Slot[64] -->
     <array-type-def dimensions='1' type-id='type-id-1078' size-in-bits='4096' id='type-id-1079'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <!-- Entry[4] -->
     <array-type-def dimensions='1' type-id='type-id-1081' size-in-bits='16896' id='type-id-1082'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- char[1024] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1083'>
       <!-- <anonymous range>[1024] -->
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <!-- int[28] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1085'>
       <!-- <anonymous range>[28] -->
       <subrange length='28' type-id='type-id-5' id='type-id-1086'/>
-
     </array-type-def>
     <!-- class ProfileData -->
     <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1087'>
-
         <member-type access='private'>
           <!-- class ProfileData::Options -->
           <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1088'>
@@ -28677,7 +28481,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::State -->
           <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1091'>
@@ -28699,11 +28502,9 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::Entry -->
           <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1081'>
-
               <member-type access='private'>
                 <!-- typedef uintptr_t ProfileData::Entry::Slot -->
                 <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1078'/>
@@ -28722,7 +28523,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::Bucket -->
           <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1093'>
@@ -28948,7 +28748,6 @@ 
     <typedef-decl name='time_t' type-id='type-id-1103' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1092'/>
     <!-- struct siginfo -->
     <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1104'>
-
         <member-type access='public'>
           <!-- union {int _pad[28]; struct {__pid_t si_pid; __uid_t si_uid;} _kill; struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer; struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt; struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} _sigchld; struct {void* si_addr;} _sigfault; struct {long int si_band; int si_fd;} _sigpoll;} -->
           <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='59' column='1' id='type-id-1105'>
@@ -29315,11 +29114,6 @@ 
     <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1116'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1021'/>
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <!-- bool FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_cpu_profiler_unittest -->
@@ -29327,7 +29121,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_nocpu_profiler_unittest -->
       <var-decl name='FLAGS_nocpu_profiler_unittest' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='78' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE'/>
     </namespace-decl>
-
     <!-- void ProfilerEnable() -->
     <function-decl name='ProfilerEnable' mangled-name='ProfilerEnable' filepath='src/profiler.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerEnable'>
       <!-- void -->
@@ -29481,17 +29274,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const double& std::min<double>(const double&, const double&) -->
       <function-decl name='min&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
@@ -29502,8 +29288,6 @@ 
         <return type-id='type-id-1135'/>
       </function-decl>
     </namespace-decl>
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <!-- int64 FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_tcmalloc_sample_parameter -->
@@ -29562,10 +29346,6 @@ 
         <return type-id='type-id-1136'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> -->
@@ -29594,7 +29374,6 @@ 
     <namespace-decl name='tcmalloc'>
       <!-- class tcmalloc::StackTraceTable -->
       <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1145'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::StackTraceTable::Bucket -->
             <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1148'>
@@ -29709,19 +29488,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <!-- int GetStackFrames(void**, int*, int, int) -->
     <function-decl name='GetStackFrames' mangled-name='_Z14GetStackFramesPPvPiii' filepath='src/stacktrace.cc' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14GetStackFramesPPvPiii'>
       <!-- parameter of type 'void**' -->
@@ -29776,17 +29544,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class SymbolTable -->
     <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1154'>
-
         <member-type access='private'>
           <!-- typedef std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > SymbolTable::SymbolMap -->
           <typedef-decl name='SymbolMap' type-id='type-id-1156' filepath='src/symbolize.h' line='72' column='1' id='type-id-1155'/>
@@ -29965,10 +29726,8 @@ 
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
       <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1169'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1207'>
@@ -31897,9 +31656,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- void tcmalloc::DumpProcSelfMaps(RawFD) -->
@@ -31919,24 +31675,20 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- SysAllocator*[2] -->
     <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='128' id='type-id-1231'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1233'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- const char*[2] -->
     <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1234'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- class MmapSysAllocator -->
     <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1235'>
@@ -32093,12 +31845,6 @@ 
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
     <!-- SbrkSysAllocator* -->
     <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1238'/>
-
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_malloc_devmem_start -->
@@ -32172,23 +31918,10 @@ 
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-57' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
     <!-- AtomicWord[8] -->
     <array-type-def dimensions='1' type-id='type-id-781' size-in-bits='512' id='type-id-782'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-5' id='type-id-1243'/>
-
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-55'/>
@@ -32198,25 +31931,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1244'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-5' id='type-id-1245'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1246'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='384' id='type-id-168'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-5' id='type-id-1247'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1248'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1249'>
@@ -32243,7 +31972,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1250'>
       <!-- <anonymous range>[1024] -->
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-1251'/>
@@ -32253,13 +31981,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1252'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <!-- int[88] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1254'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-1256'/>
@@ -32275,31 +32001,26 @@ 
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1260'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- TCEntry[64] -->
     <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='8192' id='type-id-1262'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <!-- CentralFreeListPadded[88] -->
     <array-type-def dimensions='1' type-id='type-id-1263' size-in-bits='856064' id='type-id-1264'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- SpanList[128] -->
     <array-type-def dimensions='1' type-id='type-id-1265' size-in-bits='98304' id='type-id-1266'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <!-- FreeList[88] -->
     <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='16896' id='type-id-1268'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-133'/>
@@ -32309,7 +32030,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1269'>
       <!-- <anonymous range>[2169] -->
       <subrange length='2169' type-id='type-id-5' id='type-id-1270'/>
-
     </array-type-def>
     <!-- unsigned int -->
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-1123'/>
@@ -32323,13 +32043,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1271'>
       <!-- <anonymous range>[31] -->
       <subrange length='31' type-id='type-id-5' id='type-id-1272'/>
-
     </array-type-def>
     <!-- volatile unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-1273' size-in-bits='4194304' id='type-id-1274'>
       <!-- <anonymous range>[65536] -->
       <subrange length='65536' type-id='type-id-5' id='type-id-1275'/>
-
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-1276'/>
@@ -32475,7 +32193,6 @@ 
     </class-decl>
     <!-- class SpinLock -->
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-176'>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1287'>
@@ -32483,7 +32200,6 @@ 
             <enumerator name='kSpinLockSleeper' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1288'>
@@ -32491,7 +32207,6 @@ 
             <enumerator name='kSpinLockFree' value='0'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1289'>
@@ -32961,7 +32676,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-1309' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1310'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-1309'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <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-1311'>
@@ -33181,52 +32895,42 @@ 
     </class-decl>
     <!-- class MallocHook -->
     <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1317'>
-
         <member-type access='private'>
           <!-- typedef MallocHook_PreMmapHook MallocHook::PreMmapHook -->
           <typedef-decl name='PreMmapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1318'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MmapReplacement MallocHook::MmapReplacement -->
           <typedef-decl name='MmapReplacement' type-id='type-id-907' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1319'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MunmapReplacement MallocHook::MunmapReplacement -->
           <typedef-decl name='MunmapReplacement' type-id='type-id-909' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1320'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MunmapHook MallocHook::MunmapHook -->
           <typedef-decl name='MunmapHook' type-id='type-id-910' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1321'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MremapHook MallocHook::MremapHook -->
           <typedef-decl name='MremapHook' type-id='type-id-912' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1322'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_PreSbrkHook MallocHook::PreSbrkHook -->
           <typedef-decl name='PreSbrkHook' type-id='type-id-914' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1323'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_NewHook MallocHook::NewHook -->
           <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1324'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_DeleteHook MallocHook::DeleteHook -->
           <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1325'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MmapHook MallocHook::MmapHook -->
           <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1326'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_SbrkHook MallocHook::SbrkHook -->
           <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1327'/>
@@ -33776,7 +33480,6 @@ 
     <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1331'>
     <!-- class MallocExtension -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) TCMallocImplementation::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1332'/>
@@ -34393,7 +34096,6 @@ 
     <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::_Destroy<MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
@@ -34589,7 +34291,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1380'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1430'>
@@ -35582,7 +35283,6 @@ 
       </class-decl>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-726'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-562'>
@@ -35735,7 +35435,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-1439'>
@@ -35760,7 +35459,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-1496'>
@@ -37478,7 +37176,6 @@ 
     </namespace-decl>
     <!-- class MallocExtension -->
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <!-- enum MallocExtension::Ownership -->
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
@@ -37488,7 +37185,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MallocExtension::FreeListInfo -->
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
@@ -37510,7 +37206,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
@@ -38236,7 +37931,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > -->
       <class-decl name='__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1498'/>
     </namespace-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -39330,7 +39024,6 @@ 
       </enum-decl>
       <!-- struct base::MallocRange -->
       <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1351'>
-
           <member-type access='public'>
             <!-- enum base::MallocRange::Type -->
             <enum-decl name='Type' filepath='./src/gperftools/malloc_extension.h' line='400' column='1' id='type-id-1501'>
@@ -39377,7 +39070,6 @@ 
       </enum-decl>
       <!-- class tcmalloc::LogItem -->
       <class-decl name='LogItem' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='70' column='1' id='type-id-886'>
-
           <member-type access='private'>
             <!-- enum tcmalloc::LogItem::Tag -->
             <enum-decl name='Tag' filepath='src/internal_logging.h' line='83' column='1' id='type-id-1503'>
@@ -39389,7 +39081,6 @@ 
               <enumerator name='kEnd' value='4'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- union {const char* str; void* ptr; int64_t snum; uint64_t unum;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/internal_logging.h' line='91' column='1' id='type-id-1504'>
@@ -39848,7 +39539,6 @@ 
       </class-decl>
       <!-- class tcmalloc::CentralFreeList -->
       <class-decl name='CentralFreeList' size-in-bits='9344' visibility='default' filepath='src/central_freelist.h' line='50' column='1' id='type-id-1446'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::CentralFreeList::TCEntry -->
             <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1261'>
@@ -40335,7 +40025,6 @@ 
       </class-decl>
       <!-- class tcmalloc::PageHeap -->
       <class-decl name='PageHeap' size-in-bits='4293888' visibility='default' filepath='src/page_heap.h' line='104' column='1' id='type-id-1403'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::Stats -->
             <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1330'>
@@ -40366,7 +40055,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::SmallSpanStats -->
             <class-decl name='SmallSpanStats' size-in-bits='16384' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='155' column='1' id='type-id-1453'>
@@ -40380,7 +40068,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::LargeSpanStats -->
             <class-decl name='LargeSpanStats' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='164' column='1' id='type-id-1451'>
@@ -40398,7 +40085,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::SpanList -->
             <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1265'>
@@ -40412,12 +40098,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef TCMalloc_PageMap3<35> tcmalloc::PageHeap::PageMap -->
             <typedef-decl name='PageMap' type-id='type-id-1278' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef PackedCache<35, long unsigned int> tcmalloc::PageHeap::PageMapCache -->
             <typedef-decl name='PageMapCache' type-id='type-id-1299' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
@@ -40835,7 +40519,6 @@ 
       </class-decl>
       <!-- class tcmalloc::ThreadCache -->
       <class-decl name='ThreadCache' size-in-bits='17408' visibility='default' filepath='src/thread_cache.h' line='66' column='1' id='type-id-1415'>
-
           <member-type access='private'>
             <!-- class tcmalloc::ThreadCache::FreeList -->
             <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1267'>
@@ -41005,7 +40688,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::ThreadCache::ThreadLocalData -->
             <class-decl name='ThreadLocalData' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/thread_cache.h' line='262' column='1' id='type-id-1509'>
@@ -41019,7 +40701,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- enum tcmalloc::ThreadCache::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/thread_cache.h' line='69' column='1' id='type-id-1510'>
@@ -41570,8 +41251,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_notcmalloc_large_alloc_report_threshold -->
       <var-decl name='FLAGS_notcmalloc_large_alloc_report_threshold' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='195' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE'/>
     </namespace-decl>
-
-
     <!-- class SysAllocator -->
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
@@ -41903,10 +41582,8 @@ 
       <!-- tcmalloc::PageHeapAllocator<tcmalloc::ThreadCache> tcmalloc::threadcache_allocator -->
       <var-decl name='threadcache_allocator' type-id='type-id-1412' mangled-name='_ZN8tcmalloc21threadcache_allocatorE' visibility='default' filepath='src/thread_cache.cc' line='67' column='1' elf-symbol-id='_ZN8tcmalloc21threadcache_allocatorE'/>
     </namespace-decl>
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const double& std::max<double>(const double&, const double&) -->
       <function-decl name='max&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
@@ -41926,7 +41603,5 @@ 
         <return type-id='type-id-113'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index dc009c8a..3dbf8cd2 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -753,11 +753,6 @@ 
     <elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -766,25 +761,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[40] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
@@ -811,7 +802,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-16'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-18'/>
@@ -1097,11 +1087,9 @@ 
     </class-decl>
     <!-- class vtkMultiProcessStream -->
     <class-decl name='vtkMultiProcessStream' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.h' line='35' column='1' id='type-id-51'>
-
         <member-type access='private'>
           <!-- struct vtkMultiProcessStream::vtkInternals -->
           <class-decl name='vtkInternals' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='23' column='1' id='type-id-52'>
-
               <member-type access='public'>
                 <!-- enum vtkMultiProcessStream::vtkInternals::Types -->
                 <enum-decl name='Types' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='28' column='1' id='type-id-53'>
@@ -1118,7 +1106,6 @@ 
                   <enumerator name='stream_value' value='9'/>
                 </enum-decl>
               </member-type>
-
               <member-type access='public'>
                 <!-- typedef std::deque<unsigned char, std::allocator<unsigned char> > vtkMultiProcessStream::vtkInternals::DataType -->
                 <typedef-decl name='DataType' type-id='type-id-55' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='25' column='1' id='type-id-54'/>
@@ -1746,7 +1733,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-94' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-95'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-94'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <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-96'>
@@ -2468,7 +2454,6 @@ 
     <class-decl name='vtkCommunicator' size-in-bits='576' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='45' column='1' id='type-id-116'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='private'>
           <!-- enum vtkCommunicator::Tags -->
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='65' column='1' id='type-id-118'>
@@ -2482,7 +2467,6 @@ 
             <enumerator name='BARRIER_TAG' value='16'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkCommunicator::StandardOperations -->
           <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-119'>
@@ -6104,7 +6088,6 @@ 
     </class-decl>
     <!-- class vtkSmartPointerBase -->
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-161'>
-
         <member-type access='protected'>
           <!-- class vtkSmartPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-185'/>
@@ -6727,10 +6710,8 @@ 
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ios_base -->
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-354'>
-
           <member-type access='private'>
             <!-- class std::ios_base::Init -->
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-356'>
@@ -6883,7 +6864,6 @@ 
       </class-decl>
       <!-- struct std::_Resetiosflags -->
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-390'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Fmtflags std::_Resetiosflags::fmtflags -->
             <typedef-decl name='fmtflags' type-id='type-id-391' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-232'/>
@@ -6918,7 +6898,6 @@ 
       </enum-decl>
       <!-- struct std::basic_ios<char, std::char_traits<char> > -->
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-260'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Iostate std::basic_ios<char, std::char_traits<char> >::iostate -->
             <typedef-decl name='iostate' type-id='type-id-392' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-263'/>
@@ -6993,12 +6972,10 @@ 
       </enum-decl>
       <!-- class std::__basic_file<char> -->
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-240'>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Openmode std::__basic_file<char>::openmode -->
             <typedef-decl name='openmode' type-id='type-id-393' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-243'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Seekdir std::__basic_file<char>::seekdir -->
             <typedef-decl name='seekdir' type-id='type-id-394' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-245'/>
@@ -7321,7 +7298,6 @@ 
       </function-decl>
       <!-- struct std::__miter_base<const vtkCommunicator::ReduceVoidArray::VTK_TT*, false> -->
       <class-decl name='__miter_base&lt;const vtkCommunicator::ReduceVoidArray::VTK_TT*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' is-declaration-only='yes' id='type-id-399'>
-
           <member-type access='public'>
             <!-- typedef long long int std::__miter_base<const vtkCommunicator::ReduceVoidArray::VTK_TT*, false>::VTK_TT -->
             <typedef-decl name='VTK_TT' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='1342' column='1' id='type-id-247'/>
@@ -7666,7 +7642,6 @@ 
       </function-decl>
       <!-- class std::ctype<char> -->
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-276'>
-
           <member-type access='private'>
             <!-- typedef char std::ctype<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-400'/>
@@ -7834,7 +7809,6 @@ 
       <typedef-decl name='ostream' type-id='type-id-340' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='130' column='1' id='type-id-358'/>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-265'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-349'>
@@ -7987,7 +7961,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-347'>
@@ -8012,7 +7985,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-402'>
@@ -10326,7 +10298,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Vector_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-237'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<unsigned char, std::allocator<unsigned char> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-326'>
@@ -10561,7 +10532,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<long long int, std::allocator<long long int> > -->
       <class-decl name='_Vector_base&lt;long long int, std::allocator&lt;long long int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-234'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<long long int, std::allocator<long long int> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-323'>
@@ -11643,12 +11613,10 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const long long int*, std::vector&lt;long long int, std::allocator&lt;long long int&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-443'/>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-444'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-269'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-19' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-273'/>
@@ -13063,7 +13031,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-23'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -13324,7 +13291,6 @@ 
       <!-- int -->
       <return type-id='type-id-19'/>
     </function-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -13644,7 +13610,6 @@ 
     </class-decl>
     <!-- class vtkOStreamWrapper -->
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-450'>
-
         <member-type access='private'>
           <!-- struct vtkOStreamWrapper::EndlType -->
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-302'/>
@@ -13661,7 +13626,6 @@ 
     </class-decl>
     <!-- class vtkDataArrayTemplate<char> -->
     <class-decl name='vtkDataArrayTemplate&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-371'>
-
         <member-type access='private'>
           <!-- enum vtkDataArrayTemplate<char>::DeleteMethod -->
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-451'>
@@ -13970,17 +13934,12 @@ 
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-454'/>
     <!-- vtkDummyCommunicator* -->
     <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- struct vtkMultiProcessController -->
     <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-457'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Errors -->
           <enum-decl name='Errors' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='296' column='1' id='type-id-458'>
@@ -13990,7 +13949,6 @@ 
             <enumerator name='RMI_ARG_ERROR' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Consts -->
           <enum-decl name='Consts' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='303' column='1' id='type-id-459'>
@@ -13999,7 +13957,6 @@ 
             <enumerator name='INVALID_SOURCE' value='-2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Tags -->
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='309' column='1' id='type-id-460'>
@@ -14010,11 +13967,9 @@ 
             <enumerator name='XML_WRITER_DATA_INFO' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class vtkMultiProcessController::vtkInternal -->
           <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-461'>
-
               <member-type access='private'>
                 <!-- class vtkMultiProcessController::vtkInternal::vtkRMICallback -->
                 <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-462'>
@@ -14032,7 +13987,6 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <!-- typedef vtksys::hash_map<int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> > vtkMultiProcessController::vtkInternal::RMICallbackMap -->
                 <typedef-decl name='RMICallbackMap' type-id='type-id-465' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='61' column='1' id='type-id-464'/>
@@ -16975,10 +16929,6 @@ 
     <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-481'/>
     <!-- vtkMultiProcessController* -->
     <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-471'/>
-
-
-
-
     <!-- void (void*, void*, int, int) -->
     <function-type size-in-bits='64' id='type-id-485'>
       <!-- parameter of type 'void*' -->
@@ -17257,10 +17207,6 @@ 
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-491'/>
     <!-- vtkStringArray* -->
     <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-490'/>
-
-
-
-
     <!-- void* memchr(void*, int, size_t) -->
     <function-decl name='memchr' mangled-name='*memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -17799,7 +17745,6 @@ 
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-468'/>
     <!-- class vtkWeakPointerBase -->
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-507'>
-
         <member-type access='protected'>
           <!-- class vtkWeakPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-508'/>
@@ -18994,7 +18939,6 @@ 
     <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-974'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::__fill_a<std::_Bit_type*, int>(std::_Bit_type*, std::_Bit_type*, const int&) -->
       <function-decl name='__fill_a&lt;std::_Bit_type*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'std::_Bit_type*' -->
@@ -19021,17 +18965,14 @@ 
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='186' column='1' id='type-id-630'>
       <!-- struct std::_Bit_iterator_base -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_reference std::_Bit_iterator::reference -->
             <typedef-decl name='reference' type-id='type-id-638' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='187' column='1' id='type-id-975'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_reference* std::_Bit_iterator::pointer -->
             <typedef-decl name='pointer' type-id='type-id-853' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='188' column='1' id='type-id-976'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_iterator std::_Bit_iterator::iterator -->
             <typedef-decl name='iterator' type-id='type-id-630' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='189' column='1' id='type-id-849'/>
@@ -20137,7 +20078,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-666'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-877'>
@@ -20966,7 +20906,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-669'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-880'>
@@ -21795,7 +21734,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-663'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-874'>
@@ -22764,22 +22702,18 @@ 
       <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='268' column='1' id='type-id-627'>
       <!-- struct std::_Bit_iterator_base -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <!-- typedef bool std::_Bit_const_iterator::reference -->
             <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='269' column='1' id='type-id-1006'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool std::_Bit_const_iterator::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='270' column='1' id='type-id-1007'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const bool* std::_Bit_const_iterator::pointer -->
             <typedef-decl name='pointer' type-id='type-id-626' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='271' column='1' id='type-id-1008'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_const_iterator std::_Bit_const_iterator::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-627' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='272' column='1' id='type-id-846'/>
@@ -24477,7 +24411,6 @@ 
       </class-decl>
       <!-- struct std::_Bvector_base<std::allocator<bool> > -->
       <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='375' column='1' id='type-id-643'>
-
           <member-type access='public'>
             <!-- struct std::_Bvector_base<std::allocator<bool> >::_Bvector_impl -->
             <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='381' column='1' id='type-id-855'>
@@ -25044,7 +24977,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > -->
       <class-decl name='_Vector_base&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-660'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-871'>
@@ -25234,7 +25166,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<int, std::allocator<int> > -->
       <class-decl name='_Vector_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-657'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<int, std::allocator<int> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-868'>
@@ -25534,7 +25465,6 @@ 
       </class-decl>
       <!-- class std::_List_base<int, std::allocator<int> > -->
       <class-decl name='_List_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-646'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<int, std::allocator<int> >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-858'>
@@ -32430,8 +32360,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const int*, std::vector<int, std::allocator<int> > > -->
       <class-decl name='__normal_iterator&lt;const int*, std::vector&lt;int, std::allocator&lt;int&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1035'/>
     </namespace-decl>
-
-
     <!-- class vtkOutputWindow -->
     <class-decl name='vtkOutputWindow' visibility='default' is-declaration-only='yes' id='type-id-937'/>
     <!-- void (vtkMultiProcessController*, void*) -->
@@ -32449,7 +32377,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='256' id='type-id-403'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- __gnu_cxx::__normal_iterator<const unsigned char*, std::vector<unsigned char, std::allocator<unsigned char> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-448'/>
@@ -32527,7 +32454,6 @@ 
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-430'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
       <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-417'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -34267,7 +34193,6 @@ 
       </class-decl>
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-1052'>
-
           <member-type access='protected'>
             <!-- enum std::_Deque_base<unsigned char, std::allocator<unsigned char> >::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-1082'>
@@ -34275,7 +34200,6 @@ 
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- struct std::_Deque_base<unsigned char, std::allocator<unsigned char> >::_Deque_impl -->
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-1070'>
@@ -34766,8 +34690,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcess -->
@@ -34776,10 +34698,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-502'/>
     <!-- const vtkProcess* -->
     <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-501'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcessGroup -->
@@ -34790,7 +34708,6 @@ 
     <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-504'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- int* std::__copy_move_a<false, int*, int*>(int*, int*, int*) -->
       <function-decl name='__copy_move_a&lt;false, int*, int*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'int*' -->
@@ -34837,16 +34754,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- class vtkSocketCommunicator -->
     <class-decl name='vtkSocketCommunicator' size-in-bits='1088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='55' column='1' id='type-id-1094'>
     <!-- class vtkCommunicator -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-116'/>
-
         <member-type access='private'>
           <!-- enum vtkSocketCommunicator::ErrorIds -->
           <enum-decl name='ErrorIds' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='259' column='1' id='type-id-1095'>
@@ -34856,16 +34769,13 @@ 
             <enumerator name='SwapNotSet' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class vtkSocketCommunicator::vtkMessageBuffer -->
           <class-decl name='vtkMessageBuffer' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='37' column='1' id='type-id-1096'>
-
               <member-type access='private'>
                 <!-- typedef std::map<int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > > vtkSocketCommunicator::vtkMessageBuffer::BufferType -->
                 <typedef-decl name='BufferType' type-id='type-id-1098' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='41' column='1' id='type-id-1097'/>
               </member-type>
-
               <member-type access='private'>
                 <!-- typedef std::vector<char, std::allocator<char> > vtkSocketCommunicator::vtkMessageBuffer::MessageType -->
                 <typedef-decl name='MessageType' type-id='type-id-1100' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='39' column='1' id='type-id-1099'/>
@@ -35778,17 +35688,14 @@ 
     <class-decl name='vtkStdString' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='40' column='1' id='type-id-1110'>
     <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-265'/>
-
         <member-type access='private'>
           <!-- typedef std::string vtkStdString::StdString -->
           <typedef-decl name='StdString' type-id='type-id-280' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='42' column='1' id='type-id-1111'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::char_traits<char>::char_type vtkStdString::value_type -->
           <typedef-decl name='value_type' type-id='type-id-269' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='43' column='1' id='type-id-1112'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef size_t vtkStdString::size_type -->
           <typedef-decl name='size_type' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='47' column='1' id='type-id-1113'/>
@@ -36265,7 +36172,6 @@ 
     <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1114'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- std::_Ios_Iostate std::operator&(std::_Ios_Iostate, std::_Ios_Iostate) -->
       <function-decl name='operator&amp;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'enum std::_Ios_Iostate' -->
@@ -37491,7 +37397,6 @@ 
       </function-decl>
       <!-- class std::_Rb_tree<int, std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > >, std::_Select1st<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > > -->
       <class-decl name='_Rb_tree&lt;int, std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;, std::less&lt;int&gt;, std::allocator&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<int, std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > >, std::_Select1st<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > >::_Rb_tree_impl<std::less<int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1252'>
@@ -38419,12 +38324,10 @@ 
       </class-decl>
       <!-- struct std::_Rb_tree_node_base -->
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-1198'>
-
           <member-type access='public'>
             <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
             <typedef-decl name='_Base_ptr' type-id='type-id-1260' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-1296'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-1200' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-1297'/>
@@ -39834,7 +39737,6 @@ 
       <typedef-decl name='ofstream' type-id='type-id-1272' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='138' column='1' id='type-id-1278'/>
       <!-- class std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > -->
       <class-decl name='_List_base&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1165'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1242'>
@@ -40167,7 +40069,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<char, std::allocator<char> > -->
       <class-decl name='_Vector_base&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1204'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<char, std::allocator<char> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1263'>
@@ -41151,8 +41052,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- class vtkSocket -->
     <class-decl name='vtkSocket' visibility='default' is-declaration-only='yes' id='type-id-1289'>
       <member-function access='private'>
@@ -41452,10 +41351,6 @@ 
     <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-1315'/>
     <!-- vtkSocketController* -->
     <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1314'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- class vtkSubCommunicator -->
@@ -41651,17 +41546,12 @@ 
     <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1320'/>
     <!-- vtkSubCommunicator* -->
     <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- int[20] -->
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1323'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- class vtkSubGroup -->
     <class-decl name='vtkSubGroup' size-in-bits='3520' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.h' line='49' column='1' id='type-id-1324'>
@@ -42286,7 +42176,6 @@ 
     <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::__unguarded_linear_insert<int*, int>(int*, int) -->
       <function-decl name='__unguarded_linear_insert&lt;int*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'int*' -->
@@ -42482,8 +42371,5 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index db42c743..18113024 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -890,7 +890,6 @@ 
     <elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.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'>
-
     <!-- const char* strchr(const char*, int) -->
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
@@ -911,13 +910,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.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'>
-
-
-
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-3'/>
     <!-- char -->
@@ -926,25 +918,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='1024' id='type-id-5'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-6' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='8' id='type-id-8'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='160' id='type-id-10'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-6' id='type-id-11'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='32' id='type-id-12'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-6' id='type-id-13'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-14'>
@@ -969,7 +957,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-17'>
       <!-- <anonymous range>[60] -->
       <subrange length='60' type-id='type-id-6' id='type-id-18'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-2'/>
@@ -977,7 +964,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='384' id='type-id-19'>
       <!-- <anonymous range>[12] -->
       <subrange length='12' type-id='type-id-6' id='type-id-20'/>
-
     </array-type-def>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-21'/>
@@ -985,7 +971,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='192' id='type-id-22'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-6' id='type-id-23'/>
-
     </array-type-def>
     <!-- signed char -->
     <type-decl name='signed char' size-in-bits='8' id='type-id-24'/>
@@ -995,7 +980,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='192' id='type-id-25'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-26'/>
@@ -1632,7 +1616,6 @@ 
     <typedef-decl name='source_location' type-id='type-id-15' filepath='../.././gcc/../libcpp/include/line-map.h' line='51' column='1' id='type-id-99'/>
     <!-- struct line_map -->
     <class-decl name='line_map' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='204' column='1' id='type-id-100'>
-
         <member-type access='public'>
           <!-- union line_map::map_u -->
           <union-decl name='map_u' size-in-bits='256' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='210' column='1' id='type-id-101'>
@@ -1845,7 +1828,6 @@ 
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-143'/>
-
     <!-- void* memchr(void*, int, size_t) -->
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -2752,7 +2734,6 @@ 
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-151'/>
     <!-- void* (void*, typedef size_t)* -->
     <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-150'/>
-
     <!-- void default_diagnostic_finalizer(diagnostic_context*, diagnostic_info*) -->
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <!-- parameter of type 'diagnostic_context*' -->
@@ -3900,7 +3881,6 @@ 
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
-
     <!-- 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' -->
@@ -4000,7 +3980,6 @@ 
     </class-decl>
     <!-- linemap_stats* -->
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-164'/>
-
     <!-- void dump_line_table_statistics() -->
     <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'>
       <!-- void -->
@@ -4042,7 +4021,6 @@ 
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
     <!-- wchar_t* -->
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-169'/>
-
     <!-- size_t gcc_gettext_width(const char*) -->
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <!-- parameter of type 'const char*' -->
@@ -4149,7 +4127,6 @@ 
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-173'/>
     <!-- void* (typedef size_t)* -->
     <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-
     <!-- void pp_base_set_line_maximum_length(pretty_printer*, int) -->
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <!-- parameter of type 'pretty_printer*' -->
@@ -4514,7 +4491,6 @@ 
     <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-195'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-198'/>
-
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-57' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- symbol_stack_entry* symbol_stack -->
@@ -4666,7 +4642,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.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'>
-
     <!-- void* vec_gc_p_reserve(void*, int) -->
     <function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
       <!-- parameter of type 'void*' -->
@@ -4845,26 +4820,20 @@ 
     </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'>
-
-
-
     <!-- const char[31] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='248' id='type-id-209'>
       <!-- <anonymous range>[31] -->
       <subrange length='31' type-id='type-id-6' id='type-id-210'/>
-
     </array-type-def>
     <!-- const char[6] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='48' id='type-id-211'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-6' id='type-id-212'/>
-
     </array-type-def>
     <!-- const char[7] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='56' id='type-id-213'>
       <!-- <anonymous range>[7] -->
       <subrange length='7' type-id='type-id-6' id='type-id-214'/>
-
     </array-type-def>
     <!-- const char version_string[6] -->
     <var-decl name='version_string' type-id='type-id-211' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
@@ -5542,12 +5511,10 @@ 
     </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'>
-
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-251'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- typedef __ssize_t ssize_t -->
     <typedef-decl name='ssize_t' type-id='type-id-253' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-254'/>
@@ -6053,7 +6020,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-271' size-in-bits='2048' id='type-id-272'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- 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'>
@@ -6357,11 +6323,9 @@ 
     <array-type-def dimensions='1' type-id='type-id-288' size-in-bits='192' id='type-id-289'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- struct cpp_token -->
     <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-288'>
-
         <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-290'>
@@ -6471,7 +6435,6 @@ 
     </class-decl>
     <!-- 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-297'>
-
         <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-301'>
@@ -6950,7 +6913,6 @@ 
     </class-decl>
     <!-- struct cpp_reader -->
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-306'>
-
         <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-307'>
@@ -7499,7 +7461,6 @@ 
     </class-decl>
     <!-- struct cpp_options -->
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-228'>
-
         <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-336'>
@@ -7771,7 +7732,6 @@ 
     </class-decl>
     <!-- struct cpp_context -->
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-279'>
-
         <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-339'>
@@ -7811,7 +7771,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
           <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-343'>
@@ -9422,19 +9381,15 @@ 
     <var-decl name='libiberty_concat_ptr' type-id='type-id-50' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </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'>
-
-
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-418' size-in-bits='8448' id='type-id-419'>
       <!-- <anonymous range>[33] -->
       <subrange length='33' type-id='type-id-6' id='type-id-420'/>
-
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
     <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='11136' id='type-id-422'>
       <!-- <anonymous range>[58] -->
       <subrange length='58' type-id='type-id-6' id='type-id-423'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-424'/>
@@ -10007,12 +9962,10 @@ 
     </function-type>
   </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'>
-
     <!-- const demangler_engine[11] -->
     <array-type-def dimensions='1' type-id='type-id-456' size-in-bits='2112' id='type-id-457'>
       <!-- <anonymous range>[11] -->
       <subrange length='11' type-id='type-id-6' id='type-id-458'/>
-
     </array-type-def>
     <!-- enum demangling_styles -->
     <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-459'>
@@ -10497,12 +10450,10 @@ 
     </function-decl>
   </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'>
-
     <!-- md5_uint32[2] -->
     <array-type-def dimensions='1' type-id='type-id-464' size-in-bits='64' id='type-id-465'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-6' id='type-id-466'/>
-
     </array-type-def>
     <!-- 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'>
@@ -11201,7 +11152,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='4096' id='type-id-505'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- const unsigned short int -->
     <qualified-type-def type-id='type-id-29' const='yes' id='type-id-504'/>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 11bd6a3d..014e7d2b 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -4,32 +4,22 @@ 
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <!-- char*[7] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' id='type-id-3'>
       <!-- <anonymous range>[7] -->
       <subrange length='7' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8' id='type-id-6'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' id='type-id-8'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-10'/>
@@ -37,10 +27,8 @@ 
     <array-type-def dimensions='2' type-id='type-id-10' size-in-bits='960' id='type-id-11'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-13'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
@@ -48,19 +36,16 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <!-- int*[4]*[10] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-4' id='type-id-20'/>
-
     </array-type-def>
     <!-- int[5] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
     </array-type-def>
     <!-- sizetype -->
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index e7cd4c9a..eddef776 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -136,12 +136,10 @@ 
     <elf-symbol name='_ZTSN5boost9exceptionE' size='19' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -180,7 +178,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-22' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-23'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-24'>
             <data-member access='private'>
@@ -438,7 +435,6 @@ 
             <return type-id='type-id-214'/>
           </function-decl>
           <class-decl name='file_descriptor_impl' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='50' column='1' id='type-id-86'>
-
               <member-type access='public'>
                 <enum-decl name='flags' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='52' column='1' id='type-id-249'>
                   <underlying-type type-id='type-id-16'/>
@@ -653,11 +649,9 @@ 
         </namespace-decl>
         <typedef-decl name='stream_offset' type-id='type-id-25' filepath='src/third_party/boost-1.60.0/boost/iostreams/positioning.hpp' line='36' column='1' id='type-id-253'/>
         <class-decl name='file_descriptor' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='46' column='1' id='type-id-99'>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-250' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='50' column='1' id='type-id-256'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='char_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='51' column='1' id='type-id-101'/>
             </member-type>
@@ -797,7 +791,6 @@ 
         </enum-decl>
         <class-decl name='file_descriptor_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='146' column='1' id='type-id-105'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-99'/>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-11' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='151' column='1' id='type-id-258'/>
             </member-type>
@@ -873,7 +866,6 @@ 
         </class-decl>
         <class-decl name='file_descriptor_sink' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='228' column='1' id='type-id-103'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-99'/>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-11' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='233' column='1' id='type-id-259'/>
             </member-type>
@@ -1014,7 +1006,6 @@ 
         <class-decl name='clone_impl&lt;boost::exception_detail::error_info_injector&lt;std::ios_base::failure&gt; &gt;' size-in-bits='640' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='442' column='1' id='type-id-75'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-79'/>
           <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-73'/>
-
             <member-type access='private'>
               <class-decl name='clone_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='446' column='1' id='type-id-260'/>
             </member-type>
@@ -1142,25 +1133,21 @@ 
       </class-decl>
       <namespace-decl name='detail'>
         <class-decl name='sp_element&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-261'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-86' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-262'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-263'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-87' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-264'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-265'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-88' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-266'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-267'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-268'/>
             </member-type>
@@ -1223,7 +1210,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-109'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-262' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-113'/>
           </member-type>
@@ -1370,7 +1356,6 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-
       <function-decl name='throw_exception&lt;std::ios_base::failure&gt;' mangled-name='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_'>
         <parameter type-id='type-id-216' name='e' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1'/>
         <return type-id='type-id-18'/>
@@ -1387,17 +1372,13 @@ 
         <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='256' visibility='default' is-declaration-only='yes' id='type-id-271'/>
         <typedef-decl name='wstring' type-id='type-id-271' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='78' column='1' id='type-id-201'/>
       </namespace-decl>
-
-
       <namespace-decl name='_V2'>
         <class-decl name='error_category' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-194'/>
       </namespace-decl>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-272'>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-273' 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-251'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-274' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='461' column='1' id='type-id-254'/>
           </member-type>
@@ -1648,15 +1629,12 @@ 
       <namespace-decl name='iostreams'>
         <namespace-decl name='detail'>
           <class-decl name='mapped_file_impl' size-in-bits='1088' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='45' column='1' id='type-id-89'>
-
               <member-type access='private'>
                 <typedef-decl name='size_type' type-id='type-id-178' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='47' column='1' id='type-id-158'/>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='param_type' type-id='type-id-175' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='48' column='1' id='type-id-92'/>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='mapmode' type-id='type-id-281' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='49' column='1' id='type-id-280'/>
               </member-type>
@@ -1822,11 +1800,9 @@ 
         </namespace-decl>
         <class-decl name='mapped_file_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='149' column='1' id='type-id-107'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-276' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='165' column='1' id='type-id-178'/>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='safe_bool_helper' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='151' column='1' id='type-id-283'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -1834,11 +1810,9 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-43' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='166' column='1' id='type-id-284'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='param_type' type-id='type-id-84' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='154' column='1' id='type-id-175'/>
             </member-type>
@@ -1942,7 +1916,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='mapped_file_base' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='47' column='1' id='type-id-282'>
-
             <member-type access='private'>
               <enum-decl name='mapmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='49' column='1' id='type-id-281'>
                 <underlying-type type-id='type-id-16'/>
@@ -1980,19 +1953,15 @@ 
         </class-decl>
         <class-decl name='mapped_file' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='223' column='1' id='type-id-285'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-178' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='237' column='1' id='type-id-286'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='delegate_type' type-id='type-id-107' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='225' column='1' id='type-id-287'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-121' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='238' column='1' id='type-id-288'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-43' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='239' column='1' id='type-id-289'/>
             </member-type>
@@ -2136,11 +2105,8 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <namespace-decl name='detail'>
-
         <class-decl name='sp_element&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-298'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-89' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-299'/>
             </member-type>
@@ -2420,19 +2386,16 @@ 
         </class-decl>
         <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='71' column='1' id='type-id-300'/>
         <class-decl name='sp_dereference&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-303'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-90' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-304'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-305'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-91' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-306'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-307'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-308'/>
             </member-type>
@@ -2491,7 +2454,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-115'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-299' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-119'/>
           </member-type>
@@ -2641,12 +2603,6 @@ 
       <namespace-decl name='core'>
         <typedef-decl name='typeinfo' type-id='type-id-277' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-302'/>
       </namespace-decl>
-
-
-
-
-
-
     </namespace-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
@@ -3378,7 +3334,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-43'/>
@@ -3634,7 +3589,6 @@ 
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-121'/>
     </function-decl>
-
     <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-49'/>
     </function-decl>
@@ -3674,7 +3628,6 @@ 
       <parameter type-id='type-id-221'/>
       <return type-id='type-id-32'/>
     </function-decl>
-
     <function-decl name='acos' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-9'/>
@@ -4258,10 +4211,5 @@ 
     <qualified-type-def type-id='type-id-286' const='yes' id='type-id-290'/>
     <qualified-type-def type-id='type-id-295' const='yes' id='type-id-315'/>
     <reference-type-def kind='lvalue' type-id='type-id-315' size-in-bits='64' id='type-id-297'/>
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 28df268d..ec0446f3 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -245,22 +245,16 @@ 
     <elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/block_compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='168' id='type-id-4'>
       <subrange length='21' type-id='type-id-5' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='192' id='type-id-7'>
       <subrange length='24' type-id='type-id-5' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='200' id='type-id-9'>
       <subrange length='25' type-id='type-id-5' id='type-id-10'/>
-
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='type-id-11'/>
     <type-decl name='float' size-in-bits='32' id='type-id-12'/>
@@ -380,7 +374,6 @@ 
     <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-145'/>
     <qualified-type-def type-id='type-id-145' restrict='yes' id='type-id-146'/>
     <namespace-decl name='boost'>
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='protected' static='yes'>
@@ -405,7 +398,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='rval_reference_type' type-id='type-id-119' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-147'/>
             </member-type>
@@ -458,7 +450,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <typedef-decl name='rval_reference_type' type-id='type-id-147' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-148'/>
           </member-type>
@@ -480,7 +471,6 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='basic_stringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3136' visibility='default' is-declaration-only='yes' id='type-id-95'>
-
             <member-type access='private'>
               <typedef-decl name='__string_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='669' column='1' id='type-id-149'/>
             </member-type>
@@ -498,21 +488,17 @@ 
           </member-function>
         </class-decl>
         <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' is-declaration-only='yes' id='type-id-92'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-150'>
                 <underlying-type type-id='type-id-18'/>
               </enum-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-152' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='82' column='1' id='type-id-151'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='86' column='1' id='type-id-153'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_pointer' type-id='type-id-156' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='87' column='1' id='type-id-155'/>
             </member-type>
@@ -839,12 +825,9 @@ 
         </class-decl>
         <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='832' visibility='default' is-declaration-only='yes' id='type-id-162'/>
       </namespace-decl>
-
-
       <typedef-decl name='ptrdiff_t' type-id='type-id-15' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='197' column='1' id='type-id-163'/>
       <typedef-decl name='size_t' type-id='type-id-21' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='196' column='1' id='type-id-51'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-51' 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-164'/>
           </member-type>
@@ -891,7 +874,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-167' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='75' column='1' id='type-id-166'/>
           </member-type>
@@ -912,15 +894,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;unsigned char&gt;' type-id='type-id-57' 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-168'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-138' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-165'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-126'/>
           </member-type>
@@ -942,7 +921,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' naming-typedef-id='type-id-168' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='public'>
             <typedef-decl name='__int_type' type-id='type-id-20' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='241' column='1' id='type-id-170'/>
           </member-type>
@@ -974,7 +952,6 @@ 
       </enum-decl>
       <typedef-decl name='memory_order' type-id='type-id-172' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='63' column='1' id='type-id-171'/>
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'>
-
           <member-type access='public'>
             <typedef-decl name='__integral_type' type-id='type-id-20' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='626' column='1' id='type-id-173'/>
           </member-type>
@@ -1017,7 +994,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'/>
       <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-71' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='453' column='1' id='type-id-178'/>
           </member-type>
@@ -1138,7 +1114,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-184'>
               <underlying-type type-id='type-id-18'/>
@@ -1204,7 +1179,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='private'>
             <typedef-decl name='WordType' type-id='type-id-20' filepath='src/mongo/platform/atomic_word.h' line='54' column='1' id='type-id-185'/>
           </member-type>
@@ -1410,7 +1384,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/cstdlib' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-16'/>
@@ -1418,13 +1391,11 @@ 
         <return type-id='type-id-25'/>
       </function-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-165' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-154'/>
           </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-24'>
-
               <member-type access='public'>
                 <typedef-decl name='other' type-id='type-id-168' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='169' column='1' id='type-id-167'/>
               </member-type>
@@ -1450,18 +1421,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-164' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='106' column='1' id='type-id-152'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-178' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='105' column='1' id='type-id-156'/>
           </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
     </namespace-decl>
-
     <function-decl name='memchr' filepath='/usr/include/string.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-141'/>
       <parameter type-id='type-id-13'/>
@@ -3115,18 +3083,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-222'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public' static='yes'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3155,11 +3111,6 @@ 
       <namespace-decl name='__cxx11'>
         <typedef-decl name='string' type-id='type-id-92' 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-201'/>
       </namespace-decl>
-
-
-
-
-
       <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-24'/>
@@ -3174,11 +3125,9 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-24' 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-223'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-28' 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-224'/>
           </member-type>
@@ -3224,7 +3173,6 @@ 
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='private'>
                 <typedef-decl name='type' type-id='type-id-209' 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-225'/>
               </member-type>
@@ -3282,7 +3230,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <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-37' 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-226'/>
           </member-type>
@@ -3472,7 +3419,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-208'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
@@ -3837,7 +3783,6 @@ 
       <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-228'/>
       <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-229'/>
       <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-230'>
-
           <member-type access='private'>
             <typedef-decl name='bytes_type' type-id='type-id-64' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-239'/>
           </member-type>
@@ -3876,7 +3821,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-232'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-240'>
               <underlying-type type-id='type-id-18'/>
@@ -3926,7 +3870,6 @@ 
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
-
     <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-144'/>
       <parameter type-id='type-id-26'/>
@@ -3934,9 +3877,6 @@ 
       <parameter type-id='type-id-194'/>
       <return type-id='type-id-26'/>
     </function-decl>
-
-
-
     <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-188'/>
     </function-decl>
@@ -4000,18 +3940,6 @@ 
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-258'/>
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-259'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='protected'>
@@ -4041,7 +3969,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='reference_type' type-id='type-id-247' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-260'/>
             </member-type>
@@ -4074,7 +4001,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='private'>
             <typedef-decl name='reference_type' type-id='type-id-260' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-261'/>
           </member-type>
@@ -4096,12 +4022,6 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
@@ -4123,7 +4043,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-263' 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-262'/>
           </member-type>
@@ -4162,11 +4081,9 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;unsigned long&gt;' type-id='type-id-174' 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-264'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-21' 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-265'/>
           </member-type>
@@ -4301,7 +4218,6 @@ 
       <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-237'/>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4399,7 +4315,6 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-255'>
               <underlying-type type-id='type-id-18'/>
@@ -4657,18 +4572,15 @@ 
       <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'/>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-241' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <typedef-decl name='false_' type-id='type-id-24' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-241'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-246' 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-263'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-265' 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-245'/>
           </member-type>
@@ -4678,20 +4590,13 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
     </namespace-decl>
-
-
-
   </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'>
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='832' id='type-id-266'>
       <subrange length='104' type-id='type-id-5' id='type-id-267'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='288' id='type-id-268'>
       <subrange length='36' type-id='type-id-5' id='type-id-269'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-24' size-in-bits='64' id='type-id-270'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-271'/>
@@ -4720,18 +4625,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-92' size-in-bits='64' id='type-id-160'/>
     <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
     <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-24'>
           <member-function access='public'>
@@ -4761,7 +4654,6 @@ 
         <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-294'/>
       </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-24'/>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
           <member-function access='public' static='yes'>
@@ -4772,18 +4664,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-15' 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-299'/>
             </member-type>
         </class-decl>
         <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       </namespace-decl>
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='__shared_count' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4882,7 +4768,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-301' 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-300'/>
           </member-type>
@@ -4915,7 +4800,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-22' 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-301'/>
           </member-type>
@@ -4935,7 +4819,6 @@ 
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='public'>
                 <typedef-decl name='other' type-id='type-id-175' 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-302'/>
               </member-type>
@@ -4963,7 +4846,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-176' 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-290'/>
           </member-type>
@@ -5005,7 +4887,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-234'/>
       <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-303'>
-
           <member-type access='private'>
             <typedef-decl name='__ostream_type' type-id='type-id-303' 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-304'/>
           </member-type>
@@ -5203,7 +5084,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__41' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-323'>
-
           <member-type access='private'>
             <typedef-decl name='__allocator_type' type-id='type-id-325' 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-324'/>
           </member-type>
@@ -5230,7 +5110,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__42' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-326'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-302' 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-327'/>
           </member-type>
@@ -5290,7 +5169,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__48' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-333'>
-
           <member-type access='private'>
             <typedef-decl name='_Class' type-id='type-id-334' 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-292'/>
           </member-type>
@@ -5303,11 +5181,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__49' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-335'>
-
           <member-type access='public'>
             <typedef-decl name='__result_type' type-id='type-id-22' 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-336'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__class_type' type-id='type-id-175' 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-334'/>
           </member-type>
@@ -5354,7 +5230,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-337'>
                 <underlying-type type-id='type-id-18'/>
@@ -5370,7 +5245,6 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='stdx'>
-
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <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'>
@@ -5388,7 +5262,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -5407,7 +5280,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-338'>
               <underlying-type type-id='type-id-18'/>
@@ -5425,7 +5297,6 @@ 
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'/>
       <class-decl name='__anonymous_struct__8' is-anonymous='yes' naming-typedef-id='type-id-334' visibility='default' is-declaration-only='yes' id='type-id-175'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-339'>
               <underlying-type type-id='type-id-18'/>
@@ -5541,7 +5412,6 @@ 
       <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-228'/>
       <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-229'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
@@ -5563,8 +5433,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -5599,21 +5467,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-345'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-121' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-346'/>
             </member-type>
@@ -5628,7 +5483,6 @@ 
         <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
         <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
         <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'>
-
             <member-type access='private'>
               <typedef-decl name='internal_type' type-id='type-id-346' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-341'/>
             </member-type>
@@ -5662,13 +5516,6 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
         <member-function access='public' static='yes'>
@@ -5813,7 +5660,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;' type-id='type-id-169' 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>
@@ -5900,7 +5746,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_6StatusEPT_' filepath='src/mongo/base/data_range_cursor.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6127,7 +5972,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'/>
     </namespace-decl>
-
     <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-24'>
         <member-type access='public'>
@@ -6161,15 +6005,10 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
-
-
-
   </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'>
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='16' id='type-id-348'>
       <subrange length='2' type-id='type-id-5' id='type-id-349'/>
-
     </array-type-def>
     <reference-type-def kind='rvalue' type-id='type-id-1' size-in-bits='64' id='type-id-350'/>
     <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
@@ -6210,7 +6049,6 @@ 
     <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-305'/>
     <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
     <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-24'>
@@ -6229,7 +6067,6 @@ 
           </class-decl>
         </namespace-decl>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='string_type' type-id='type-id-92' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-368'/>
             </member-type>
@@ -6359,11 +6196,9 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <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-24'>
-
               <member-type access='private'>
                 <typedef-decl name='reference' type-id='type-id-270' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-390'/>
               </member-type>
@@ -6414,7 +6249,6 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-
         <function-decl name='sp_enable_shared_from_this' mangled-name='_ZN5boost6detail26sp_enable_shared_from_thisEz' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail26sp_enable_shared_from_thisEz'>
           <parameter is-variadic='yes'/>
           <return type-id='type-id-22'/>
@@ -6511,17 +6345,8 @@ 
         </class-decl>
         <typedef-decl name='sp_typeinfo' type-id='type-id-392' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-365'/>
       </namespace-decl>
-
-
-
-
-
-
-
-
       <namespace-decl name='system'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-140' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-393'/>
             </member-type>
@@ -6583,7 +6408,6 @@ 
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-346' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-351'/>
           </member-type>
@@ -6604,15 +6428,7 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-163' 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-394'/>
           </member-type>
@@ -6658,14 +6474,12 @@ 
         <return type-id='type-id-22'/>
       </function-decl>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;char&gt;' type-id='type-id-179' 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-395'/>
           </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' 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-376'/>
           </member-type>
@@ -6713,7 +6527,6 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'>
-
           <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-121' 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-396'/>
           </member-type>
@@ -6739,7 +6552,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-177' 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-397'/>
           </member-type>
@@ -6771,7 +6583,6 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-227'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-228' 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-398'/>
           </member-type>
@@ -7000,7 +6811,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-394' 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-401'/>
           </member-type>
@@ -7101,7 +6911,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-402'>
                 <underlying-type type-id='type-id-18'/>
@@ -7114,8 +6923,6 @@ 
           <underlying-type type-id='type-id-18'/>
         </enum-decl>
       </namespace-decl>
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='private'>
           <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'>
@@ -7270,7 +7077,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
       <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-234'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-403'>
               <underlying-type type-id='type-id-18'/>
@@ -7294,13 +7100,10 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-391' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <typedef-decl name='true_' type-id='type-id-24' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-391'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -7316,20 +7119,14 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_reader.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-404'>
       <subrange length='16' type-id='type-id-5' id='type-id-405'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='152' id='type-id-406'>
       <subrange length='19' type-id='type-id-5' id='type-id-407'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='280' id='type-id-408'>
       <subrange length='35' type-id='type-id-5' id='type-id-409'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-410' const='yes' id='type-id-411'/>
     <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-412'/>
@@ -7346,24 +7143,11 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-422'/>
     <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-424'/>
     <namespace-decl name='boost'>
-
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       </namespace-decl>
-
-
-
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-410'/>
             </member-type>
@@ -7399,13 +7183,6 @@ 
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'>
         <parameter type-id='type-id-71' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1'/>
@@ -7441,11 +7218,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-425'>
-
           <member-type access='private'>
             <typedef-decl name='iostate' type-id='type-id-172' 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-183'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-426' 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-399'/>
           </member-type>
@@ -7650,7 +7425,6 @@ 
     <namespace-decl name='mongo'>
       <namespace-decl name='FTDCBSONUtil'>
       </namespace-decl>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -7761,9 +7535,6 @@ 
       <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-220'/>
       <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-238'/>
     </namespace-decl>
-
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -7793,25 +7564,11 @@ 
     </namespace-decl>
   </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'>
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='632' id='type-id-427'>
       <subrange length='79' type-id='type-id-5' id='type-id-428'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-429'/>
     <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-24'/>
       </namespace-decl>
@@ -7840,7 +7597,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='argument_type' type-id='type-id-200' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-430'/>
             </member-type>
@@ -7855,7 +7611,6 @@ 
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='argument_type' type-id='type-id-430' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-431'/>
           </member-type>
@@ -7881,11 +7636,6 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
@@ -7903,7 +7653,6 @@ 
     <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-24'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-432'>
                 <underlying-type type-id='type-id-18'/>
@@ -7911,8 +7660,6 @@ 
             </member-type>
         </class-decl>
       </namespace-decl>
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -7984,7 +7731,6 @@ 
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'/>
       <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'/>
       <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-186'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-433'>
               <underlying-type type-id='type-id-18'/>
@@ -8024,7 +7770,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-232'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
@@ -8040,8 +7785,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -8057,30 +7800,20 @@ 
     </namespace-decl>
   </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'>
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='32' id='type-id-434'>
       <subrange length='4' type-id='type-id-5' id='type-id-435'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='40' id='type-id-436'>
       <subrange length='5' type-id='type-id-5' id='type-id-437'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-438'>
       <subrange length='6' type-id='type-id-5' id='type-id-439'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-440'>
       <subrange length='7' type-id='type-id-5' id='type-id-441'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='64' id='type-id-442'>
       <subrange length='8' type-id='type-id-5' id='type-id-443'/>
-
     </array-type-def>
     <type-decl name='signed char' size-in-bits='8' id='type-id-444'/>
     <qualified-type-def type-id='type-id-245' const='yes' id='type-id-445'/>
@@ -8096,7 +7829,6 @@ 
     <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-455'/>
     <reference-type-def kind='rvalue' type-id='type-id-20' size-in-bits='64' id='type-id-456'/>
     <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-24'>
           <member-function access='public'>
@@ -8121,17 +7853,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
@@ -8151,14 +7872,7 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-458' 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-457'/>
           </member-type>
@@ -8291,7 +8005,6 @@ 
           <parameter type-id='type-id-125' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
           <return type-id='type-id-24'/>
         </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-200' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
           <parameter type-id='type-id-277' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
@@ -8333,14 +8046,11 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'/>
-
-
       <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-273' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
           <return type-id='type-id-24'/>
         </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-273' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
           <return type-id='type-id-24'/>
@@ -8862,7 +8572,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__26' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-461'>
               <underlying-type type-id='type-id-18'/>
@@ -8873,7 +8582,6 @@ 
     </namespace-decl>
     <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-24'>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-446' 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-458'/>
           </member-type>
@@ -8910,9 +8618,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -8942,8 +8647,6 @@ 
     </namespace-decl>
   </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'>
-
-
     <namespace-decl name='mongo'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
@@ -8971,8 +8674,5 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 755ea6dc..cbe8d20e 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -43,97 +43,62 @@ 
     <elf-symbol name='__this_module' size='896' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-3'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='96' id='type-id-5'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='128' id='type-id-8'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='128' id='type-id-10'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='72' id='type-id-12'>
       <subrange length='9' type-id='type-id-1' id='type-id-13'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-15'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='256' id='type-id-18'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-20'/>
     <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='256' id='type-id-22'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-23'/>
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-25'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='192' id='type-id-26'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='1024' id='type-id-27'>
       <subrange length='128' type-id='type-id-1' id='type-id-28'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='128' id='type-id-29'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='16384' id='type-id-30'>
       <subrange length='2048' type-id='type-id-1' id='type-id-31'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='160' id='type-id-32'>
       <subrange length='20' type-id='type-id-1' id='type-id-33'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='256' id='type-id-34'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='448' id='type-id-35'>
       <subrange length='56' type-id='type-id-1' id='type-id-36'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='48' id='type-id-37'>
       <subrange length='6' type-id='type-id-1' id='type-id-38'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='64' id='type-id-39'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <class-decl name='anon_vma' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-41'/>
     <class-decl name='assoc_array_ptr' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-42'/>
@@ -234,181 +199,140 @@ 
     <class-decl name='xol_area' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-137'/>
     <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='192' id='type-id-139'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='256' id='type-id-141'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='256' id='type-id-143'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='512' id='type-id-145'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-146' size-in-bits='4096' id='type-id-147'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-148' size-in-bits='192' id='type-id-149'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-150'/>
     <array-type-def dimensions='1' type-id='type-id-150' size-in-bits='128' id='type-id-151'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='16384' id='type-id-153'>
       <subrange length='64' type-id='type-id-1' id='type-id-154'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-155' size-in-bits='infinite' id='type-id-156'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-158' size-in-bits='384' id='type-id-159'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='infinite' id='type-id-161'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-162' id='type-id-163'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <type-decl name='long int' size-in-bits='64' id='type-id-164'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-165'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-166'/>
     <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='1728' id='type-id-168'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='2016' id='type-id-170'>
       <subrange length='7' type-id='type-id-1' id='type-id-171'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='128' id='type-id-173'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-174' size-in-bits='2688' id='type-id-175'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='1024' id='type-id-177'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-178' size-in-bits='128' id='type-id-179'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='256' id='type-id-181'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-182' size-in-bits='1344' id='type-id-183'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-184' size-in-bits='384' id='type-id-185'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2048' id='type-id-187'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='448' id='type-id-189'>
       <subrange length='7' type-id='type-id-1' id='type-id-171'/>
-
     </array-type-def>
     <type-decl name='short int' size-in-bits='16' id='type-id-190'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-191'/>
     <array-type-def dimensions='1' type-id='type-id-192' size-in-bits='192' id='type-id-193'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-194' size-in-bits='2304' id='type-id-195'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <typedef-decl name='__uint128_t' type-id='type-id-196' id='type-id-14'/>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='512' id='type-id-198'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='64' id='type-id-199'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='128' id='type-id-200'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-201' size-in-bits='512' id='type-id-202'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='24' id='type-id-204'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='32' id='type-id-205'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='64' id='type-id-206'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-207'/>
     <type-decl name='unsigned __int128' size-in-bits='128' id='type-id-196'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-208'/>
     <array-type-def dimensions='1' type-id='type-id-208' size-in-bits='256' id='type-id-209'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-210'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-211'/>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='64' id='type-id-212'>
       <subrange length='1' type-id='type-id-1' id='type-id-213'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='128' id='type-id-214'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='2944' id='type-id-215'>
       <subrange length='46' type-id='type-id-1' id='type-id-216'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='256' id='type-id-217'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='infinite' id='type-id-218'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-219'/>
     <array-type-def dimensions='1' type-id='type-id-220' size-in-bits='128' id='type-id-221'>
       <subrange length='1' type-id='type-id-1' id='type-id-213'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-222' size-in-bits='256' id='type-id-223'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-224'/>
     <array-type-def dimensions='1' type-id='type-id-225' size-in-bits='256' id='type-id-226'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <class-decl name='sdhci_host' size-in-bits='8704' is-struct='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.h' line='371' column='1' id='type-id-227'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index e806f963..4cd83b4f 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -207,26 +207,19 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmclose.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
-
-
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-21'/>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='128' id='type-id-22'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='768' id='type-id-24'>
       <subrange length='6' type-id='type-id-21' id='type-id-25'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-26' size-in-bits='192' id='type-id-27'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-28'/>
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='32' id='type-id-29'>
       <subrange length='4' type-id='type-id-21' id='type-id-30'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-31'/>
@@ -516,14 +509,11 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmdump.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='8' id='type-id-62'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='160' id='type-id-63'>
       <subrange length='20' type-id='type-id-21' id='type-id-64'/>
-
     </array-type-def>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-65'/>
     <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-66'/>
@@ -737,10 +727,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmload.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
     <array-type-def dimensions='1' type-id='type-id-80' size-in-bits='256' id='type-id-81'>
       <subrange length='2' type-id='type-id-21' id='type-id-82'/>
-
     </array-type-def>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <class-decl name='dump_file' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmload.c' line='30' column='1' id='type-id-83'>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index b99ee499..984d0d3a 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -12,7 +12,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'/>
@@ -42,7 +41,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-15'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='infinite' id='type-id-16'>
       <subrange length='infinite' id='type-id-17'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-18'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-19'/>
@@ -141,7 +139,6 @@ 
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-74'/>
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
     <namespace-decl name='std'>
-
       <typedef-decl name='string' type-id='type-id-51' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-72'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
@@ -216,7 +213,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-20'/>
@@ -566,59 +562,45 @@ 
     </function-decl>
     <namespace-decl name='std'>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='112' column='1' id='type-id-51'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-81' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-57'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_CharT_alloc_type' type-id='type-id-83' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='114' column='1' id='type-id-82'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='traits_type' type-id='type-id-85' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='118' column='1' id='type-id-84'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-87' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='119' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='120' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-90' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='122' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-92' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='123' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-94' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='124' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-96' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='125' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-98' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-100' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='127' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-102' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='129' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-104' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='130' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-106' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='131' column='1' id='type-id-105'/>
           </member-type>
@@ -1746,27 +1728,21 @@ 
       </class-decl>
     </namespace-decl>
     <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-39'>
-
         <member-type access='public'>
           <typedef-decl name='size_type' type-id='type-id-109' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='95' column='1' id='type-id-81'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-110' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='96' column='1' id='type-id-90'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-92'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-44' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-94'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-96'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='const_pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='98' column='1' id='type-id-98'/>
         </member-type>
@@ -1778,13 +1754,11 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-106'/>
     </namespace-decl>
     <class-decl name='rebind&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-111'>
-
         <member-type access='public'>
           <typedef-decl name='other' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='105' column='1' id='type-id-83'/>
         </member-type>
     </class-decl>
     <class-decl name='char_traits&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-85'>
-
         <member-type access='public'>
           <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.8.2/bits/char_traits.h' line='235' column='1' id='type-id-87'/>
         </member-type>
@@ -1797,36 +1771,13 @@ 
       <parameter type-id='type-id-71' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-21'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
       <parameter type-id='type-id-71' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <parameter type-id='type-id-71' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
index 4d1d3402..0afcc121 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
@@ -12,13 +12,10 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -47,7 +44,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-20'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-21'/>
@@ -58,7 +54,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-27' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-28'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
             <data-member access='private'>
@@ -245,9 +240,7 @@ 
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-99'/>
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <namespace-decl name='std'>
-
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-56'/>
@@ -264,39 +257,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -310,7 +294,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-115'/>
@@ -1445,15 +1428,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
           </member-type>
@@ -1487,11 +1467,9 @@ 
         <return type-id='type-id-59'/>
       </function-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
           </member-type>
@@ -1598,25 +1576,19 @@ 
       <typedef-decl name='ostream' type-id='type-id-118' filepath='/usr/include/c++/5.3.1/iosfwd' line='141' column='1' id='type-id-96'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
           </member-type>
@@ -2086,7 +2058,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-32'/>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
index 7fb22564..82fec255 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -12,13 +12,10 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -47,7 +44,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-20'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-21'/>
@@ -57,7 +53,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-26' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-27'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-28' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-26'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-26' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-28'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-29'>
             <data-member access='private'>
@@ -228,19 +223,15 @@ 
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-79'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-80'/>
     <namespace-decl name='std'>
-
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-81'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-60'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-62'/>
           </member-type>
       </class-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-82'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-83'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-84'/>
@@ -249,39 +240,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-85' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-58'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-84' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-88' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-87'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-90' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-92' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-94' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-96' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-98' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-99'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -295,7 +277,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-56'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-99'/>
@@ -319,15 +300,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-84'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-100' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-85'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-90'/>
           </member-type>
@@ -644,25 +622,19 @@ 
       <return type-id='type-id-72'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-100' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-33' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-31' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-106'/>
           </member-type>
@@ -828,7 +800,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-31'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index 1cf67cad..478b7491 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -60,11 +60,9 @@ 
     <class-decl name='s0' size-in-bits='384' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='13' column='1' id='type-id-9'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-7'/>
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='type-id-8'/>
-
         <member-type access='public'>
           <typedef-decl name='integer' type-id='type-id-3' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='type-id-10'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='byte' type-id='type-id-5' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='type-id-11'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi
index 0bd86868..95c81b58 100644
--- a/tests/data/test-read-dwarf/test1.hash.abi
+++ b/tests/data/test-read-dwarf/test1.hash.abi
@@ -60,11 +60,9 @@ 
     <class-decl name='s0' size-in-bits='384' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='13' column='1' id='10ec88de'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='96c6f7f7'/>
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='95c6f664'/>
-
         <member-type access='public'>
           <typedef-decl name='integer' type-id='95e97e5e' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='61814d27'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='byte' type-id='002ac4a6' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='92bf8355'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index bc8d8ae2..5cd2d0d7 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -411,23 +411,16 @@ 
     <elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-8'>
       <subrange length='4' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-10'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -457,7 +450,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-22'/>
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='infinite' id='type-id-23'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-25'/>
     <type-decl name='void' id='type-id-26'/>
@@ -828,11 +820,7 @@ 
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-178'/>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-134'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-138'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
@@ -933,7 +921,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-168'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-131'/>
@@ -950,39 +937,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-181' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-141'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-131' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-182'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-184' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-183'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-186' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-185'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-72' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-187'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-69' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-188'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-190' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-189'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-192' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-191'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-180'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -2268,15 +2246,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-131'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-75'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-181'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-184'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-186'/>
           </member-type>
@@ -2303,38 +2278,30 @@ 
       </class-decl>
       <typedef-decl name='size_t' type-id='type-id-22' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-195'/>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-196'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-197'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-41' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-199'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-200'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-202' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='177' column='1' id='type-id-201'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-17' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-198'/>
       <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-203'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-202' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='188' column='1' id='type-id-204'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-205'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-53' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-206'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-207'/>
           </member-type>
@@ -2342,15 +2309,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-190'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-192'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-143'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-53' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-208'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-209'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-53' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-210'/>
           </member-type>
@@ -2395,7 +2359,6 @@ 
       </class-decl>
       <typedef-decl name='string' type-id='type-id-134' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-211'/>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-146'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-212'/>
           </member-type>
@@ -2410,7 +2373,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-149'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-213'/>
           </member-type>
@@ -2540,25 +2502,19 @@ 
         <parameter type-id='type-id-18'/>
         <return type-id='type-id-36'/>
       </function-decl>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-75'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-41' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-215'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-53' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-216'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-217'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-218'/>
           </member-type>
@@ -2620,15 +2576,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-72'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-197' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-219'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-200' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-199' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-221'/>
           </member-type>
@@ -2736,15 +2689,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-69'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-205' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-222'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-207' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-223'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-206' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-224'/>
           </member-type>
@@ -2996,9 +2946,6 @@ 
       <return type-id='type-id-16'/>
     </function-decl>
     <namespace-decl name='boost'>
-
-
-
       <namespace-decl name='noncopyable_'>
         <class-decl name='noncopyable' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/noncopyable.hpp' line='23' column='1' id='type-id-77'>
           <member-function access='protected' constructor='yes'>
@@ -3037,9 +2984,7 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='system'>
-
         <class-decl name='error_condition' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='230' column='1' id='type-id-84'>
-
             <member-type access='public'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-177' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='272' column='1' id='type-id-233'/>
             </member-type>
@@ -3203,7 +3148,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='error_code' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='317' column='1' id='type-id-82'>
-
             <member-type access='public'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-177' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-234'/>
             </member-type>
@@ -3320,14 +3264,12 @@ 
         </function-decl>
       </namespace-decl>
       <namespace-decl name='filesystem'>
-
         <function-decl name='codecvt_error_category' mangled-name='_ZN5boost10filesystem22codecvt_error_categoryEv' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem22codecvt_error_categoryEv'>
           <return type-id='type-id-102'/>
         </function-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='int_&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-127'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-117' mangled-name='_ZN4mpl_4int_ILi3EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
@@ -3683,7 +3625,6 @@ 
       <parameter type-id='type-id-15'/>
       <return type-id='type-id-19'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-53'/>
@@ -3869,7 +3810,6 @@ 
       <parameter type-id='type-id-155'/>
       <return type-id='type-id-28'/>
     </function-decl>
-
     <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-12'/>
       <parameter type-id='type-id-12'/>
@@ -3898,19 +3838,15 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-236' size-in-bits='infinite' id='type-id-237'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-238' size-in-bits='infinite' id='type-id-239'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-240'/>
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='39936' id='type-id-241'>
       <subrange length='624' type-id='type-id-4' id='type-id-242'/>
-
     </array-type-def>
     <typedef-decl name='__gthread_once_t' type-id='type-id-243' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='49' column='1' id='type-id-244'/>
     <typedef-decl name='pthread_once_t' type-id='type-id-15' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='168' column='1' id='type-id-243'/>
@@ -4104,11 +4040,7 @@ 
     <qualified-type-def type-id='type-id-178' const='yes' id='type-id-484'/>
     <reference-type-def kind='lvalue' type-id='type-id-484' size-in-bits='64' id='type-id-485'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='remove_reference&lt;boost::filesystem::filesystem_error::m_imp*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-486'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-293' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-479'/>
           </member-type>
@@ -4120,7 +4052,6 @@ 
       <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-487'/>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-488'/>
       <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-422'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-426'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-489'/>
@@ -4221,7 +4152,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-467'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-419'/>
@@ -4238,39 +4168,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-490' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-429'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-419' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-491'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-493' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-492'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-495' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-494'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-251' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-496'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-248' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-497'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-499' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-498'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-501' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-500'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-489'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -5460,15 +5381,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-419'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-254'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-490'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-493'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-495'/>
           </member-type>
@@ -5494,29 +5412,23 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator_traits&lt;wchar_t*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-502'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-503'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-178' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-504'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-505'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;wchar_t const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-506'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-507'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-158' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-508'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-509'/>
           </member-type>
@@ -5524,15 +5436,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t const*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-499'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-501'/>
       <class-decl name='initializer_list&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-431'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-158' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-510'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-511'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-158' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-512'/>
           </member-type>
@@ -5577,11 +5486,9 @@ 
       </class-decl>
       <typedef-decl name='wstring' type-id='type-id-422' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='68' column='1' id='type-id-457'/>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='62' column='1' id='type-id-434'>
-
           <member-type access='public'>
             <typedef-decl name='category' type-id='type-id-15' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='67' column='1' id='type-id-442'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='475' column='1' id='type-id-438'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -5724,7 +5631,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='436' column='1' id='type-id-448'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -5931,7 +5837,6 @@ 
         <return type-id='type-id-26'/>
       </function-decl>
       <class-decl name='remove_reference&lt;boost::filesystem::detail::dir_itr_imp*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-515'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-278' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-477'/>
           </member-type>
@@ -5972,7 +5877,6 @@ 
         <return type-id='type-id-197'/>
       </function-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='451' column='1' id='type-id-475'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-22' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-452'/>
           </member-type>
@@ -6071,36 +5975,28 @@ 
     </namespace-decl>
     <namespace-decl name='boost'>
       <namespace-decl name='mpl'>
-
-
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;const boost::filesystem::path, const boost::filesystem::path&amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-517'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-519' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-518'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-520'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-521' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-519'/>
             </member-type>
         </class-decl>
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;boost::filesystem::directory_entry, boost::filesystem::directory_entry&amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-522'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-524' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-523'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-525'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-526' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-524'/>
             </member-type>
         </class-decl>
       </namespace-decl>
-
       <namespace-decl name='detail'>
-
         <function-decl name='atomic_exchange_and_add' mangled-name='_ZN5boost6detail23atomic_exchange_and_addEPii' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail23atomic_exchange_and_addEPii'>
           <parameter type-id='type-id-462'/>
           <parameter type-id='type-id-15'/>
@@ -6111,13 +6007,11 @@ 
           <return type-id='type-id-26'/>
         </function-decl>
         <class-decl name='sp_element&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-527'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-276' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-528'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_arrow_dispatch&lt;const boost::filesystem::path&amp;, const boost::filesystem::path*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-529'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-366' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-530'/>
             </member-type>
@@ -6129,14 +6023,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::path::iterator, const boost::filesystem::path, const boost::filesystem::path&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-531'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-518' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-532'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;' visibility='default' is-declaration-only='yes' id='type-id-521'/>
         <class-decl name='operator_arrow_dispatch&lt;boost::filesystem::directory_entry&amp;, boost::filesystem::directory_entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-533'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-283' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-534'/>
             </member-type>
@@ -6148,7 +6040,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::filesystem::directory_entry&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-535'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-523' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-536'/>
             </member-type>
@@ -6478,31 +6369,26 @@ 
         </class-decl>
         <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/shared_count.hpp' line='60' column='1' id='type-id-537'/>
         <class-decl name='sp_element&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-539'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-291' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-540'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-541'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-292' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-542'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-543'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-293' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-544'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-545'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-277' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-546'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-547'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-278' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-548'/>
             </member-type>
@@ -6668,7 +6554,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-312'>
-
           <member-type access='public'>
             <typedef-decl name='element_type' type-id='type-id-528' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-316'/>
           </member-type>
@@ -6998,19 +6883,15 @@ 
           </member-function>
         </class-decl>
         <class-decl name='path' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='55' column='1' id='type-id-295'>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='66' column='1' id='type-id-376'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='string_type' type-id='type-id-134' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='69' column='1' id='type-id-373'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='codecvt_type' type-id='type-id-488' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='71' column='1' id='type-id-367'/>
             </member-type>
-
             <member-type access='public'>
               <class-decl name='iterator' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='569' column='1' id='type-id-298'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-307'/>
@@ -8190,7 +8071,6 @@ 
         </function-decl>
         <class-decl name='filesystem_error' size-in-bits='448' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='64' column='1' id='type-id-289'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-325'/>
-
             <member-type access='private'>
               <class-decl name='m_imp' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='159' column='1' id='type-id-291'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -8303,15 +8183,12 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::path::iterator, const boost::filesystem::path, boost::bidirectional_traversal_tag, const boost::filesystem::path&amp;, long int&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-307'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-365' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-556'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-17' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-557'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-530' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-558'/>
           </member-type>
@@ -8388,13 +8265,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='enable_if_c&lt;true, boost::filesystem::path&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-559'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-296' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-550'/>
           </member-type>
       </class-decl>
       <namespace-decl name='system'>
-
         <function-decl name='system_category' mangled-name='_ZN5boost6system15system_categoryEv' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
           <return type-id='type-id-102'/>
         </function-decl>
@@ -8573,15 +8448,12 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::single_pass_traversal_tag, boost::filesystem::directory_entry&amp;, long int&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-305'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-280' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-555'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-17' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-560'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-534' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-561'/>
           </member-type>
@@ -8660,13 +8532,10 @@ 
       <namespace-decl name='core'>
         <typedef-decl name='typeinfo' type-id='type-id-513' filepath='src/third_party/boost-1.56.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-538'/>
       </namespace-decl>
-
       <class-decl name='shared_ptr&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-318'>
-
           <member-type access='public'>
             <typedef-decl name='element_type' type-id='type-id-540' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-322'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='this_type' type-id='type-id-318' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='328' column='1' id='type-id-562'/>
           </member-type>
@@ -8828,10 +8697,8 @@ 
       </class-decl>
       <namespace-decl name='iterators'>
         <class-decl name='enabled&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='30' column='1' id='type-id-563'>
-
             <member-type access='public'>
               <class-decl name='base&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='33' column='1' id='type-id-564'>
-
                   <member-type access='public'>
                     <typedef-decl name='type' type-id='type-id-1' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='35' column='1' id='type-id-565'/>
                   </member-type>
@@ -8839,9 +8706,6 @@ 
             </member-type>
         </class-decl>
       </namespace-decl>
-
-
-
       <function-decl name='addressof&lt;boost::filesystem::directory_entry&gt;' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-280'/>
         <return type-id='type-id-283'/>
@@ -9048,29 +8912,23 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <function-decl name='__is_null_pointer&lt;char&gt;' mangled-name='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_'>
         <parameter type-id='type-id-41'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='new_allocator&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-254'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-567'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-178' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-568'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-158' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-569'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-570'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-571'/>
           </member-type>
@@ -9132,15 +8990,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__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;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-251'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-503' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-572'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-505' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-573'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-504' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-574'/>
           </member-type>
@@ -9241,15 +9096,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;wchar_t const*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-248'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-507' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-575'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-509' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-576'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-508' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-577'/>
           </member-type>
@@ -9351,7 +9203,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-404'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-98' mangled-name='_ZN4mpl_5bool_ILb1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
@@ -9420,8 +9271,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-12'/>
       <parameter type-id='type-id-15'/>
@@ -9474,7 +9323,6 @@ 
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-578' size-in-bits='64' id='type-id-579'/>
@@ -9491,9 +9339,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-585' size-in-bits='64' id='type-id-592'/>
     <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-593'/>
     <namespace-decl name='std'>
-
-
-
       <function-decl name='operator&lt; &lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_'>
         <parameter type-id='type-id-136'/>
         <parameter type-id='type-id-136'/>
@@ -9525,11 +9370,9 @@ 
         <return type-id='type-id-205'/>
       </function-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='233' column='1' id='type-id-595'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='235' column='1' id='type-id-585'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-15' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='236' column='1' id='type-id-589'/>
           </member-type>
@@ -9633,23 +9476,18 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <function-decl name='__is_null_pointer&lt;char const&gt;' mangled-name='_ZN9__gnu_cxx17__is_null_pointerIKcEEbPT_' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__is_null_pointerIKcEEbPT_'>
         <parameter type-id='type-id-53'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='__enable_if&lt;true, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='47' column='1' id='type-id-596'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='48' column='1' id='type-id-594'/>
           </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='addr_impl_ref&lt;const boost::filesystem::path&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='25' column='1' id='type-id-578'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='v_' type-id='type-id-584' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='27' column='1'/>
@@ -9692,8 +9530,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='dispatch&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSsRT_RKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/boost/filesystem/path_traits.hpp' line='171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSsRT_RKSt7codecvtIwc11__mbstate_tE'>
@@ -9713,11 +9549,6 @@ 
           </function-decl>
         </namespace-decl>
       </namespace-decl>
-
-
-
-
-
       <function-decl name='addressof&lt;const boost::filesystem::path&gt;' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-365'/>
         <return type-id='type-id-366'/>
@@ -9728,10 +9559,6 @@ 
         <return type-id='type-id-565'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-599'/>
@@ -9754,23 +9581,16 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-620'/>
     <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-621'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-604'>
-
           <member-type access='public'>
             <typedef-decl name='result' type-id='type-id-623' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='73' column='1' id='type-id-622'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='state_type' type-id='type-id-49' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='76' column='1' id='type-id-619'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='extern_type' type-id='type-id-2' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='75' column='1' id='type-id-607'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='intern_type' type-id='type-id-27' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='74' column='1' id='type-id-611'/>
           </member-type>
@@ -9802,7 +9622,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='46' column='1' id='type-id-624'>
-
           <member-type access='public'>
             <enum-decl name='result' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='49' column='1' id='type-id-623'>
               <underlying-type type-id='type-id-240'/>
@@ -9814,13 +9633,7 @@ 
           </member-type>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='convert' mangled-name='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE'>
@@ -9944,30 +9757,17 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
-
-
-
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
         <parameter type-id='type-id-136'/>
         <parameter type-id='type-id-53'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
-
         <function-decl name='native' mangled-name='_ZN5boost10filesystem6nativeERKSs' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem6nativeERKSs'>
           <parameter type-id='type-id-456'/>
           <return type-id='type-id-1'/>
@@ -9993,28 +9793,12 @@ 
           <return type-id='type-id-1'/>
         </function-decl>
       </namespace-decl>
-
-
-
-
-
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-551'/>
     <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-626'/>
-
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='dispatch&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSbIwSt11char_traitsIwESaIwEERT_RKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/boost/filesystem/path_traits.hpp' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSbIwSt11char_traitsIwESaIwEERT_RKSt7codecvtIwc11__mbstate_tE'>
@@ -10032,27 +9816,16 @@ 
           </function-decl>
         </namespace-decl>
       </namespace-decl>
-
-
-
-
-
       <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-627'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-26' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-625'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-628'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-629'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-630'>
             <data-member access='private'>
@@ -10081,8 +9854,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-642'/>
     <reference-type-def kind='lvalue' type-id='type-id-178' size-in-bits='64' id='type-id-643'/>
     <namespace-decl name='std'>
-
-
       <class-decl name='numeric_limits&lt;wchar_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/limits' line='650' column='1' id='type-id-644'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-98' visibility='default' filepath='/usr/include/c++/4.9/limits' line='652' column='1'/>
@@ -10214,9 +9985,6 @@ 
         <enumerator name='round_toward_neg_infinity' value='3'/>
       </enum-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -10332,7 +10100,5 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 6789be55..e4027a02 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -634,58 +634,34 @@ 
     <elf-symbol name='_ZTVN5mongo36ExportedScramIterationCountParameterE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/auth/sasl_options.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='112' id='type-id-2'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-5'/>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='96' id='type-id-6'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='112' id='type-id-8'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-9'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='8' id='type-id-11'>
       <subrange length='1' type-id='type-id-3' id='type-id-12'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='160' id='type-id-13'>
       <subrange length='20' type-id='type-id-3' id='type-id-14'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='336' id='type-id-15'>
       <subrange length='42' type-id='type-id-3' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='32' id='type-id-17'>
       <subrange length='4' type-id='type-id-3' id='type-id-18'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='400' id='type-id-19'>
       <subrange length='50' type-id='type-id-3' id='type-id-20'/>
-
     </array-type-def>
     <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -714,7 +690,6 @@ 
     <type-decl name='int' size-in-bits='32' id='type-id-29'/>
     <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='320' id='type-id-30'>
       <subrange length='10' type-id='type-id-3' id='type-id-31'/>
-
     </array-type-def>
     <type-decl name='long double' size-in-bits='128' id='type-id-32'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-23'/>
@@ -725,39 +700,31 @@ 
     <type-decl name='sizetype' size-in-bits='64' id='type-id-3'/>
     <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='6400' id='type-id-38'>
       <subrange length='100' type-id='type-id-3' id='type-id-39'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-40'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-41'/>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='832' id='type-id-42'>
       <subrange length='104' type-id='type-id-3' id='type-id-43'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='96' id='type-id-44'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='128' id='type-id-45'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='24' id='type-id-46'>
       <subrange length='3' type-id='type-id-3' id='type-id-47'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='40' id='type-id-48'>
       <subrange length='5' type-id='type-id-3' id='type-id-49'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-25'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-50'/>
     <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='39936' id='type-id-51'>
       <subrange length='624' type-id='type-id-3' id='type-id-52'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='infinite' id='type-id-53'>
       <subrange length='infinite' id='type-id-54'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-55'/>
     <type-decl name='void' id='type-id-56'/>
@@ -887,7 +854,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-79' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-80'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-81' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-79'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-81'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-82'>
             <data-member access='private'>
@@ -2644,8 +2610,6 @@ 
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-2179'/>
     <pointer-type-def type-id='type-id-2179' size-in-bits='64' id='type-id-2180'/>
     <namespace-decl name='std'>
-
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='77' column='1' id='type-id-1879'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -2692,43 +2656,33 @@ 
         <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-975'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-984'/>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1652' column='1' id='type-id-2181'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-1294' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2182'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1655' column='1' id='type-id-2183'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__hash_code' type-id='type-id-2185' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2184'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-958' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1863'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='iterator' type-id='type-id-2187' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1672' column='1' id='type-id-2186'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_iterator' type-id='type-id-2189' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1676' column='1' id='type-id-2188'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='local_iterator' type-id='type-id-2191' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1681' column='1' id='type-id-2190'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_local_iterator' type-id='type-id-2193' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1687' column='1' id='type-id-2192'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2195' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1691' column='1' id='type-id-2194'/>
             </member-type>
@@ -2776,15 +2730,12 @@ 
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-978'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-987'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-990'/>
-
             <member-type access='public'>
               <typedef-decl name='hasher' type-id='type-id-1161' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2196'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__hash_code' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-2185'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__node_type' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-958'/>
             </member-type>
@@ -2953,15 +2904,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-1005'>
-
             <member-type access='public'>
               <typedef-decl name='first_argument_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-2197'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='second_argument_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-2198'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='444' column='1' id='type-id-2199'/>
             </member-type>
@@ -3061,11 +3009,9 @@ 
         <class-decl name='_Local_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2191'/>
         <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2193'/>
         <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-996'>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-2181' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-999'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='mapped_type' type-id='type-id-2200' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-1002'/>
             </member-type>
@@ -3102,23 +3048,18 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
         </class-decl>
         <class-decl name='_Insert_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1875'>
-
             <member-type access='protected'>
               <typedef-decl name='__hashtable' type-id='type-id-687' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-1877'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='value_type' type-id='type-id-2182' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-993'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='iterator' type-id='type-id-2186' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='697' column='1' id='type-id-2202'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='const_iterator' type-id='type-id-2188' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='698' column='1' id='type-id-2203'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2194' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-2204'/>
             </member-type>
@@ -3174,7 +3115,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-949'>
-
             <member-type access='public'>
               <typedef-decl name='__hashtable' type-id='type-id-687' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1807' column='1' id='type-id-952'/>
             </member-type>
@@ -3188,19 +3128,15 @@ 
         </class-decl>
         <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-968'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-981'/>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-2206' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1894' column='1' id='type-id-1859'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_alloc_type' type-id='type-id-1081' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-972'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_base' type-id='type-id-1849' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-1857'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__bucket_type' type-id='type-id-1858' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-1854'/>
             </member-type>
@@ -3282,7 +3218,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-1009'>
-
             <member-type access='public'>
               <typedef-decl name='_State' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2207'/>
             </member-type>
@@ -3355,7 +3290,6 @@ 
       <namespace-decl name='chrono'>
         <namespace-decl name='_V2'>
           <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='716' column='1' id='type-id-2208'>
-
               <member-type access='public'>
                 <typedef-decl name='time_point' type-id='type-id-1139' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1115'/>
               </member-type>
@@ -3382,7 +3316,6 @@ 
           </class-decl>
         </namespace-decl>
         <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1139'>
-
             <member-type access='public'>
               <typedef-decl name='duration' type-id='type-id-1118' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1142'/>
             </member-type>
@@ -3434,7 +3367,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1118'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1122'/>
             </member-type>
@@ -3557,7 +3489,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1125'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1129'/>
             </member-type>
@@ -3681,7 +3612,6 @@ 
         </class-decl>
         <typedef-decl name='milliseconds' type-id='type-id-1125' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2209'/>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1132'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1136'/>
             </member-type>
@@ -3805,7 +3735,6 @@ 
         </class-decl>
         <typedef-decl name='seconds' type-id='type-id-1132' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2210'/>
       </namespace-decl>
-
       <enum-decl name='_Ios_Openmode' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='103' column='1' id='type-id-2211'>
         <underlying-type type-id='type-id-40'/>
         <enumerator name='_S_app' value='1'/>
@@ -3822,7 +3751,6 @@ 
         <return type-id='type-id-2211'/>
       </function-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-37'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-1989'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1042'/>
@@ -3839,39 +3767,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2212' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1113'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1042' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2213'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2215' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-2214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2217' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-2216'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-129' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-2218'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-126' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-2219'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2221' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-2220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2223' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-2222'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-2224'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -3885,7 +3804,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1110'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2224'/>
@@ -5154,15 +5072,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1042'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2212'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-215' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2215'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-361' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2217'/>
           </member-type>
@@ -5188,63 +5103,50 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator_traits&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-2225'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2226'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1107' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2228'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1106' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2229'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-23' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-2227'/>
       <class-decl name='iterator_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2230'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-2231'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-2232'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-2233'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1983' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2234'/>
           </member-type>
       </class-decl>
       <typedef-decl name='size_t' type-id='type-id-50' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-1334'/>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2235'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-2236'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-71' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-2237'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-215' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2238'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-2239'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2240'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-84' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2241'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-361' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2242'/>
           </member-type>
@@ -5252,15 +5154,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2221'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2223'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1168'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-84' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2243'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2244'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-84' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2245'/>
           </member-type>
@@ -5304,7 +5203,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='remove_reference&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2246'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1105' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2074'/>
           </member-type>
@@ -5314,7 +5212,6 @@ 
         <return type-id='type-id-1106'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2247'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-37' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2084'/>
           </member-type>
@@ -5329,50 +5226,39 @@ 
         <return type-id='type-id-37'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::BSONObjBuilder*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2248'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1517' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2249'/>
           </member-type>
       </class-decl>
       <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1416'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-897'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1423'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2251' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2250'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2253' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2252'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2255' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2254'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2257' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2256'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2259' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2258'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2261' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2260'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2263' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2262'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2264'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1420'/>
           </member-type>
@@ -5856,7 +5742,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-897'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1809'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1048'/>
@@ -5898,15 +5783,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2268' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2251'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2269' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-900'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-903'/>
           </member-type>
@@ -6013,22 +5895,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1048'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-148'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2270'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1592' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2271'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2272'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2273'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2274'/>
                 </member-type>
@@ -6056,35 +5933,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2275'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2272' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1957'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2271' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2276'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2276' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2277'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2279' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2278'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2278' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2280'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2270' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2281'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2281' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2282'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2284' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2283'/>
           </member-type>
@@ -6179,15 +6048,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;**&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2287'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1592' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2288'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2285'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2279'/>
           </member-type>
@@ -6199,37 +6065,31 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2289'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1893'/>
           </member-type>
       </class-decl>
       <class-decl name='make_unsigned&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1666' column='1' id='type-id-2290'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2291' filepath='/usr/include/c++/4.9/type_traits' line='1667' column='1' id='type-id-2286'/>
           </member-type>
       </class-decl>
       <class-decl name='__make_unsigned_selector&lt;long int, true, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1634' column='1' id='type-id-2292'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2293' filepath='/usr/include/c++/4.9/type_traits' line='1641' column='1' id='type-id-2291'/>
           </member-type>
       </class-decl>
       <class-decl name='__match_cv_qualifiers&lt;long int, long unsigned int, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1578' column='1' id='type-id-2294'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2295' filepath='/usr/include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2293'/>
           </member-type>
       </class-decl>
       <class-decl name='__cv_selector&lt;long unsigned int, false, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1560' column='1' id='type-id-2296'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-50' filepath='/usr/include/c++/4.9/type_traits' line='1561' column='1' id='type-id-2295'/>
           </member-type>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1177'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2297'/>
           </member-type>
@@ -6245,7 +6105,6 @@ 
       </class-decl>
       <typedef-decl name='false_type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2267'/>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2298'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2274' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2284'/>
           </member-type>
@@ -6254,7 +6113,6 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;**, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2263'/>
       <class-decl name='initializer_list&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2265'/>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1180'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2299'/>
           </member-type>
@@ -6273,7 +6131,6 @@ 
       <class-decl name='unique_ptr&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;, std::default_delete&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2300'/>
       <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1102'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-942'/>
-
           <member-type access='public'>
             <typedef-decl name='__integral_type' type-id='type-id-25' filepath='/usr/include/c++/4.9/atomic' line='619' column='1' id='type-id-2301'/>
           </member-type>
@@ -6313,7 +6170,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-942'>
-
           <member-type access='private'>
             <typedef-decl name='__int_type' type-id='type-id-25' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1842'/>
           </member-type>
@@ -6548,39 +6404,30 @@ 
       <typedef-decl name='memory_order' type-id='type-id-2303' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-2302'/>
       <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1223'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-727'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-582' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1230'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2305' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2304'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2307' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2306'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2309' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-2308'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2311' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2310'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2313' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2312'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2315' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2314'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='468' column='1' id='type-id-2316'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1227'/>
           </member-type>
@@ -7061,7 +6908,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-727'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1701'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
@@ -7096,15 +6942,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2318' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-730'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2320' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2319'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2321'/>
           </member-type>
@@ -7245,27 +7088,21 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1060'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1633' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2305'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-584' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2307'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2322'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1066' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2318'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2323'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2320'/>
                 </member-type>
@@ -7299,39 +7136,30 @@ 
       <class-decl name='initializer_list&lt;mongo::optionenvironment::OptionSection&gt;' visibility='default' is-declaration-only='yes' id='type-id-2317'/>
       <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1213'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-721'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-578' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2325' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2324'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2327' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2326'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2329' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-2328'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2331' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2330'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2333' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2332'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2335' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2334'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='468' column='1' id='type-id-2336'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1217'/>
           </member-type>
@@ -7812,7 +7640,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-721'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1695'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
@@ -7847,15 +7674,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2338' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-724'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2340' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2339'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2341'/>
           </member-type>
@@ -7996,43 +7820,33 @@ 
       </class-decl>
       <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1446'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-924'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1455'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2343' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2342'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2345' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2344'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2347' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2346'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-135' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2348'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-132' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2349'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2351' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2350'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2353' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2352'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-1453'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1450'/>
           </member-type>
@@ -8559,7 +8373,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-924'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1830'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1084'/>
@@ -8614,15 +8427,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2354' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2343'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2355' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-927'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-930'/>
           </member-type>
@@ -8749,31 +8559,24 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1084'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-172'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2356'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2357'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2358'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2359'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2360'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2361'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1069' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2362'/>
                 </member-type>
@@ -8845,35 +8648,27 @@ 
       </class-decl>
       <class-decl name='_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-820'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2363'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2358' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1965'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2357' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2364'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2364' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2365'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2367' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2366'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2366' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2368'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2356' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2369'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2369' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2370'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2372' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2371'/>
           </member-type>
@@ -9005,15 +8800,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2374'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2375'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2373'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2367'/>
           </member-type>
@@ -9025,19 +8817,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2376'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1901'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2377'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2360' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2372'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Rb_tree_node&lt;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='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2378'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2362' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2379'/>
           </member-type>
@@ -9045,15 +8834,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2351'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2353'/>
       <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1171'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1107' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2380'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2381'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-1107' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2382'/>
           </member-type>
@@ -9097,47 +8883,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1265'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-789' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2383'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1' id='type-id-1272'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='mapped_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1275'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='101' column='1' id='type-id-1278'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2384'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1096' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='103' column='1' id='type-id-1269'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2386' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2385'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2388' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2387'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2390' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='151' column='1' id='type-id-2389'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2392' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='153' column='1' id='type-id-2391'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2394' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='154' column='1' id='type-id-2393'/>
           </member-type>
@@ -9507,7 +9282,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-789'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1743'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1078'/>
@@ -9556,59 +9330,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='366' column='1' id='type-id-2390'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-2399' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-793'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='354' column='1' id='type-id-1739'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1' id='type-id-2400'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-799'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1' id='type-id-802'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-804' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2401'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2402'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-835' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2403'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1096' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-796'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-2386'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-805' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2388'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2404' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='587' column='1' id='type-id-2392'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2405' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2394'/>
           </member-type>
@@ -10215,15 +9975,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1078'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-168'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2406'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2407'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-832' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2408'/>
           </member-type>
@@ -10280,11 +10037,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-836'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='94' column='1' id='type-id-2409'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2410'/>
           </member-type>
@@ -10331,7 +10086,6 @@ 
         <enumerator name='_S_black' value='1'/>
       </enum-decl>
       <class-decl name='aligned_storage&lt;16ul, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2412'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2413'>
               <member-type access='private'>
@@ -10347,7 +10101,6 @@ 
           </member-type>
       </class-decl>
       <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1302'>
-
           <member-type access='public'>
             <typedef-decl name='first_type' type-id='type-id-1105' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2415'/>
           </member-type>
@@ -10420,35 +10173,27 @@ 
       </class-decl>
       <class-decl name='binary_function&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2416'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2417'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2418' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1971'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2420' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2419'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2419' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2421'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2423' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2422'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2422' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2424'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2426' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2425'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2425' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2427'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2429' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2428'/>
           </member-type>
@@ -10544,22 +10289,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1096'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2426'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2420'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2418'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2431'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1078' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2432'/>
                 </member-type>
@@ -10587,15 +10327,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2433'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2434'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2430'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2423'/>
           </member-type>
@@ -10607,35 +10344,28 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2435'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1907'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2436'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2432' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2429'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-814'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-2409' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='182' column='1' id='type-id-2437'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2068' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='175' column='1' id='type-id-2438'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='176' column='1' id='type-id-2439'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-817'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='183' column='1' id='type-id-2440'/>
           </member-type>
@@ -10716,27 +10446,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-805'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-2410' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='254' column='1' id='type-id-2441'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1304' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2442'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1305' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2443'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='248' column='1' id='type-id-811'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-805' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-808'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-835' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2444'/>
           </member-type>
@@ -10884,15 +10608,12 @@ 
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2397'/>
       <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2398'/>
       <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1174'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1305' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2445'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2446'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-1305' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2447'/>
           </member-type>
@@ -10939,43 +10660,33 @@ 
       <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-1348'/>
       <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1458'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-933'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1330' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1465'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2449' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2448'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2451' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2450'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2453' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2452'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2455' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2454'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2457' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2456'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2459' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2458'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2461' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2460'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2462'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1099' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1462'/>
           </member-type>
@@ -11466,7 +11177,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-933'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1837'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1099'/>
@@ -11508,15 +11218,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2464' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2449'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2465' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-936'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1099' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-939'/>
           </member-type>
@@ -11630,22 +11337,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1099'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-182'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2466'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2105' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2467'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1330' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2468'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2469'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1099' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2470'/>
                 </member-type>
@@ -11846,43 +11548,33 @@ 
       </class-decl>
       <class-decl name='vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1426'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-906'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1617' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1433'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2474' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2473'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2476' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2475'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2478' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2477'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2480' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2479'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2482' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2481'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2484' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2483'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2486' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2485'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2487'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1051' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1430'/>
           </member-type>
@@ -12366,7 +12058,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-906'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1816'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1051'/>
@@ -12408,15 +12099,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2489' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2474'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2490' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-909'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1051' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-912'/>
           </member-type>
@@ -12523,22 +12211,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1051'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-150'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2491'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1622' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2492'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1617' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2493'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2494'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1051' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2495'/>
                 </member-type>
@@ -12566,35 +12249,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2496'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2493' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1959'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2492' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2497'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2497' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2498'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2500' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2499'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2499' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2501'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2491' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2502'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2502' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2503'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2505' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2504'/>
           </member-type>
@@ -12689,15 +12364,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;mongo::optionenvironment::Constraint**&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2507'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1622' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2508'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2506'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2500'/>
           </member-type>
@@ -12709,13 +12381,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::optionenvironment::Constraint*, mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2509'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1617' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1895'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::optionenvironment::Constraint*&gt;, mongo::optionenvironment::Constraint*, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2510'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2495' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2505'/>
           </member-type>
@@ -12725,43 +12395,33 @@ 
       <class-decl name='initializer_list&lt;mongo::optionenvironment::Constraint*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2488'/>
       <class-decl name='vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1436'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-915'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1625' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1443'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2512' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2511'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2514' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2513'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2516' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2515'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2518' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2517'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2520' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2519'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2522' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2521'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2524' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2523'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2525'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1054' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1440'/>
           </member-type>
@@ -13245,7 +12905,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-915'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1823'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1054'/>
@@ -13287,15 +12946,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2527' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2512'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2528' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-918'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1054' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-921'/>
           </member-type>
@@ -13402,22 +13058,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1054'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-152'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2529'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1630' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2530'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1625' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2531'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2532'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1054' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2533'/>
                 </member-type>
@@ -13445,35 +13096,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2534'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2531' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1961'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2530' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2535'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2535' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2536'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2538' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2537'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2537' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2539'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2529' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2540'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2540' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2541'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2543' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2542'/>
           </member-type>
@@ -13568,15 +13211,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;mongo::optionenvironment::KeyConstraint**&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2545'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1630' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2546'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2544'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2538'/>
           </member-type>
@@ -13588,13 +13228,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::optionenvironment::KeyConstraint*, mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2547'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1625' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1897'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;, mongo::optionenvironment::KeyConstraint*, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2548'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2533' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2543'/>
           </member-type>
@@ -13603,47 +13241,36 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::optionenvironment::KeyConstraint**, std::vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2524'/>
       <class-decl name='initializer_list&lt;mongo::optionenvironment::KeyConstraint*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2526'/>
       <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1249'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-773' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2549'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1' id='type-id-1256'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='mapped_type' type-id='type-id-586' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1259'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1298' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='101' column='1' id='type-id-1262'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2550'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1093' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='103' column='1' id='type-id-1253'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2552' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2551'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2554' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2553'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2556' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='151' column='1' id='type-id-2555'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2558' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='153' column='1' id='type-id-2557'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2560' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='154' column='1' id='type-id-2559'/>
           </member-type>
@@ -14007,7 +13634,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-773'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1734'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1075'/>
@@ -14050,59 +13676,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='366' column='1' id='type-id-2556'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-2566' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-777'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='354' column='1' id='type-id-1730'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1' id='type-id-2567'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-783'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1298' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1' id='type-id-786'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-788' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2568'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1754' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2569'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-831' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2570'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1093' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-780'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2571' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-2552'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2572' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2554'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2573' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='587' column='1' id='type-id-2558'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2574' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2560'/>
           </member-type>
@@ -14736,7 +14348,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='aligned_storage&lt;104ul, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2575'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='832' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2576'>
               <member-type access='private'>
@@ -14809,35 +14420,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2578'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2579' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1969'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2581' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2580'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2580' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2582'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2584' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2583'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2583' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2585'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2587' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2586'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2586' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2588'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2590' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2589'/>
           </member-type>
@@ -14933,22 +14536,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1093'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2587'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2067' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2581'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1298' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2579'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2592'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1075' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2593'/>
                 </member-type>
@@ -14976,15 +14574,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2594'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2067' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2595'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2591'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2584'/>
           </member-type>
@@ -14996,13 +14591,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2596'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1298' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1905'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2597'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2593' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2590'/>
           </member-type>
@@ -15016,43 +14609,33 @@ 
       <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2562'/>
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2563'/>
       <class-decl name='set&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='90' column='1' id='type-id-1317'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-741' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1' id='type-id-2598'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='103' column='1' id='type-id-1324'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='104' column='1' id='type-id-1327'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='105' column='1' id='type-id-2599'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='106' column='1' id='type-id-2600'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='107' column='1' id='type-id-1321'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2602' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='130' column='1' id='type-id-2601'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2602' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='131' column='1' id='type-id-2603'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2605' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='132' column='1' id='type-id-2604'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2607' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='134' column='1' id='type-id-2606'/>
           </member-type>
@@ -15369,7 +14952,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::_Identity&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-741'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1716'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1069'/>
@@ -15412,59 +14994,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='366' column='1' id='type-id-2607'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-2610' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-745'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='354' column='1' id='type-id-1712'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1' id='type-id-2611'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-751'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1' id='type-id-754'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-756' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2612'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1750' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2613'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-823' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2614'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-748'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2616' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-2615'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2617' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2602'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2619' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='587' column='1' id='type-id-2618'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2620' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2605'/>
           </member-type>
@@ -16119,7 +15687,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-855'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-873'/>
         <base-class access='private' layout-offset-in-bits='32' type-id='type-id-709'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-873' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-858'/>
           </member-type>
@@ -16200,7 +15767,6 @@ 
       <class-decl name='_Tuple_impl&lt;1ul, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-873'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1786'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-718'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-1786' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-876'/>
           </member-type>
@@ -16347,7 +15913,6 @@ 
       <class-decl name='allocator_arg_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/uses_allocator.h' line='39' column='1' id='type-id-2622'/>
       <class-decl name='__uses_alloc0' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/uses_allocator.h' line='69' column='1' id='type-id-2623'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2624'/>
-
           <member-type access='public'>
             <class-decl name='_Anything' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/uses_allocator.h' line='70' column='1' id='type-id-1916'>
               <member-function access='public' constructor='yes'>
@@ -16611,7 +16176,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Mutex_base&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='88' column='1' id='type-id-2627'>
-
           <member-type access='protected'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='92' column='1' id='type-id-2628'>
               <underlying-type type-id='type-id-40'/>
@@ -16622,7 +16186,6 @@ 
       <class-decl name='__weak_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' visibility='default' is-declaration-only='yes' id='type-id-1027'/>
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/new' line='99' column='1' id='type-id-2471'/>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::optionenvironment::Constraint, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2629'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1616' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2472'/>
           </member-type>
@@ -16630,35 +16193,27 @@ 
       <class-decl name='__weak_ptr&lt;mongo::optionenvironment::Constraint, (__gnu_cxx::_Lock_policy)2u&gt;' visibility='default' is-declaration-only='yes' id='type-id-1030'/>
       <class-decl name='weak_ptr&lt;mongo::optionenvironment::Constraint&gt;' visibility='default' is-declaration-only='yes' id='type-id-1468'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2630'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2468' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1973'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2467' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2631'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2631' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2632'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2634' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2633'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2633' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2635'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2466' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2636'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2636' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2637'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2639' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2638'/>
           </member-type>
@@ -16753,15 +16308,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2641'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2105' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2642'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2640'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2634'/>
           </member-type>
@@ -16773,13 +16325,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2643'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1330' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1909'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;, std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2644'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2470' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2639'/>
           </member-type>
@@ -16789,27 +16339,21 @@ 
       <class-decl name='initializer_list&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2463'/>
       <class-decl name='allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1057'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-154'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1631' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2325'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-580' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2327'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2645'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1063' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2338'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2646'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1057' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2340'/>
                 </member-type>
@@ -16843,43 +16387,33 @@ 
       <class-decl name='initializer_list&lt;mongo::optionenvironment::OptionDescription&gt;' visibility='default' is-declaration-only='yes' id='type-id-2337'/>
       <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1396'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-879'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-209' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1403'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2648' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2647'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2650' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2649'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2652' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2651'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2654' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2653'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2656' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2655'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2658' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2657'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2660' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2659'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2661'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1036' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1400'/>
           </member-type>
@@ -17363,7 +16897,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-879'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1795'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1036'/>
@@ -17405,15 +16938,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2663' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2648'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2664' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-882'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1036' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-885'/>
           </member-type>
@@ -17520,22 +17050,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1036'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2665'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2666'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-209' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2667'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2668'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1036' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2669'/>
                 </member-type>
@@ -17563,35 +17088,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2670'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2667' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1953'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2666' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2671'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2671' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2672'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2674' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2673'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2673' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2675'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2665' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2676'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2676' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2677'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2679' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2678'/>
           </member-type>
@@ -17686,15 +17203,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2681'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2682'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2680'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2674'/>
           </member-type>
@@ -17706,13 +17220,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2683'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-209' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1889'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;, boost::shared_ptr&lt;boost::program_options::option_description&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2684'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2669' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2679'/>
           </member-type>
@@ -17722,35 +17234,27 @@ 
       <class-decl name='initializer_list&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2662'/>
       <class-decl name='vector&lt;bool, std::allocator&lt;bool&gt; &gt;' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='526' column='1' id='type-id-1389'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-675'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='536' column='1' id='type-id-2685'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-671' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='538' column='1' id='type-id-2686'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='539' column='1' id='type-id-2687'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-663' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='542' column='1' id='type-id-2688'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-660' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='543' column='1' id='type-id-2689'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1309' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='544' column='1' id='type-id-2690'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1313' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='545' column='1' id='type-id-2691'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1033' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='546' column='1' id='type-id-1393'/>
           </member-type>
@@ -18202,7 +17706,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='411' column='1' id='type-id-675'>
-
           <member-type access='public'>
             <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='416' column='1' id='type-id-1661'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
@@ -18237,11 +17740,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Bit_alloc_type' type-id='type-id-2692' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='414' column='1' id='type-id-678'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1033' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='440' column='1' id='type-id-681'/>
           </member-type>
@@ -18338,15 +17839,12 @@ 
       </class-decl>
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='214' column='1' id='type-id-663'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-671' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='216' column='1' id='type-id-2693'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1654' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='217' column='1' id='type-id-2694'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-663' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='218' column='1' id='type-id-1650'/>
           </member-type>
@@ -18517,7 +18015,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, bool, long int, bool*, bool&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118' column='1' id='type-id-2696'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-23' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='125' column='1' id='type-id-2695'/>
           </member-type>
@@ -18587,10 +18084,8 @@ 
       </class-decl>
       <class-decl name='allocator&lt;bool&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1033'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2697'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1045' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2692'/>
                 </member-type>
@@ -18619,19 +18114,15 @@ 
       </class-decl>
       <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='300' column='1' id='type-id-660'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='302' column='1' id='type-id-2698'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='303' column='1' id='type-id-2699'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-334' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='304' column='1' id='type-id-2700'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-660' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='305' column='1' id='type-id-1647'/>
           </member-type>
@@ -18732,19 +18223,15 @@ 
       </class-decl>
       <class-decl name='reverse_iterator&lt;std::_Bit_const_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1309'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2701'/>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-660' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2702'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2704' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='111' column='1' id='type-id-2703'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2706' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2705'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2708' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2707'/>
           </member-type>
@@ -18853,34 +18340,27 @@ 
       </class-decl>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, bool, long int, bool const*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118' column='1' id='type-id-2701'/>
       <class-decl name='__iterator_traits&lt;std::_Bit_const_iterator, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-2709'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2695' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-2704'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2700' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-2706'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2698' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-2708'/>
           </member-type>
       </class-decl>
       <class-decl name='reverse_iterator&lt;std::_Bit_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1313'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2710'/>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-663' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2711'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2713' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='111' column='1' id='type-id-2712'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2715' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2714'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2717' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2716'/>
           </member-type>
@@ -18989,29 +18469,23 @@ 
       </class-decl>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, bool, long int, std::_Bit_reference*, std::_Bit_reference&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118' column='1' id='type-id-2710'/>
       <class-decl name='__iterator_traits&lt;std::_Bit_iterator, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-2718'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2695' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-2713'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2694' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-2715'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2693' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-2717'/>
           </member-type>
       </class-decl>
       <class-decl name='initializer_list&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1165'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-334' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2719'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2720'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-334' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2721'/>
           </member-type>
@@ -19056,43 +18530,33 @@ 
       </class-decl>
       <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1406'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-888'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-212' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1413'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2723' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2722'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2725' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2724'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2727' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2726'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2729' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2728'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2731' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2730'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2733' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2732'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2735' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2734'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2736'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1039' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1410'/>
           </member-type>
@@ -19576,7 +19040,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-888'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1802'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
@@ -19618,15 +19081,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2738' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2723'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2739' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-891'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1039' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-894'/>
           </member-type>
@@ -19733,22 +19193,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1039'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-142'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2740'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2741'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-212' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2742'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2743'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1039' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2744'/>
                 </member-type>
@@ -19776,35 +19231,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2745'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2742' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1955'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2741' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2746'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2746' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2747'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2749' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2748'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2748' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2750'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2740' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2751'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2751' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2752'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2754' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2753'/>
           </member-type>
@@ -19899,15 +19346,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2756'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2757'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2755'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2749'/>
           </member-type>
@@ -19919,13 +19363,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2758'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-212' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1891'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;, boost::shared_ptr&lt;boost::program_options::options_description&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2759'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2744' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2754'/>
           </member-type>
@@ -19937,24 +19379,19 @@ 
       <typedef-decl name='ostream' type-id='type-id-2760' filepath='/usr/include/c++/4.9/iosfwd' line='136' column='1' id='type-id-2053'/>
       <class-decl name='vector&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2157'/>
       <class-decl name='unique_ptr&lt;mongo::BSONObjBuilder, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1353'>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2761'>
-
                 <member-type access='public'>
                   <typedef-decl name='type' type-id='type-id-1514' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2762'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1339' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2763'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2762' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2764'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='deleter_type' type-id='type-id-1145' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1357'/>
           </member-type>
@@ -20150,7 +19587,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-843'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-861'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-703'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-861' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-846'/>
           </member-type>
@@ -20231,7 +19667,6 @@ 
       <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-861'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1786'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-712'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-1786' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-864'/>
           </member-type>
@@ -20426,19 +19861,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::BSONObjBuilder&gt;, const std::default_delete&lt;mongo::BSONObjBuilder&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2767'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1147' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2765'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2768'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1145' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2089'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::BSONObjBuilder, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2769'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1513' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2766'/>
           </member-type>
@@ -20452,7 +19884,6 @@ 
         <return type-id='type-id-2249'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2770'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-37' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2082'/>
           </member-type>
@@ -20467,7 +19898,6 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2771'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1446' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2093'/>
           </member-type>
@@ -20477,7 +19907,6 @@ 
         <return type-id='type-id-2094'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::Status (*&amp;)(mongo::InitializerContext*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2772'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-224' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2078'/>
           </member-type>
@@ -20487,7 +19916,6 @@ 
         <return type-id='type-id-2079'/>
       </function-decl>
       <class-decl name='__add_c_ref&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='53' column='1' id='type-id-2773'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1981' filepath='/usr/include/c++/4.9/tuple' line='54' column='1' id='type-id-2774'/>
           </member-type>
@@ -20496,7 +19924,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-849'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-706'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-867' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-852'/>
           </member-type>
@@ -20577,7 +20004,6 @@ 
       <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-867'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1786'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-715'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-1786' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-870'/>
           </member-type>
@@ -20832,7 +20258,6 @@ 
         <return type-id='type-id-2774'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2775'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2001' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2776'/>
           </member-type>
@@ -20859,7 +20284,6 @@ 
         <return type-id='type-id-1985'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::InitializerContext*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2777'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1545' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2076'/>
           </member-type>
@@ -20880,7 +20304,6 @@ 
         <return type-id='type-id-1985'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2778'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2080'/>
           </member-type>
@@ -20902,7 +20325,6 @@ 
         <return type-id='type-id-1985'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2779'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1985' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2087'/>
           </member-type>
@@ -20951,23 +20373,18 @@ 
         <return type-id='type-id-1479'/>
       </function-decl>
       <class-decl name='move_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-1283'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-2780'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2231' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='957' column='1' id='type-id-2051'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2232' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='958' column='1' id='type-id-2781'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='960' column='1' id='type-id-2782'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2052' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-2783'/>
           </member-type>
@@ -21161,7 +20578,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
       <class-decl name='_Iter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='209' column='1' id='type-id-2784'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-132' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='211' column='1' id='type-id-2785'/>
           </member-type>
@@ -21188,7 +20604,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
       <class-decl name='_Iter_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='209' column='1' id='type-id-2786'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='211' column='1' id='type-id-2787'/>
           </member-type>
@@ -21216,7 +20631,6 @@ 
         <return type-id='type-id-1985'/>
       </function-decl>
       <class-decl name='_Iter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='217' column='1' id='type-id-2788'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-2790' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='219' column='1' id='type-id-2789'/>
           </member-type>
@@ -21232,7 +20646,6 @@ 
         <return type-id='type-id-2789'/>
       </function-decl>
       <class-decl name='_Iter_base&lt;__gnu_cxx::__normal_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='217' column='1' id='type-id-2791'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-2793' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='219' column='1' id='type-id-2792'/>
           </member-type>
@@ -21346,11 +20759,9 @@ 
       </union-decl>
       <class-decl name='_Undefined_class' visibility='default' is-declaration-only='yes' id='type-id-1789'/>
       <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1837' column='1' id='type-id-684'>
-
           <member-type access='public'>
             <typedef-decl name='_Manager_type' type-id='type-id-185' filepath='/usr/include/c++/4.9/functional' line='2005' column='1' id='type-id-2795'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Base_manager&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1844' column='1' id='type-id-2796'>
               <data-member access='protected' static='yes'>
@@ -21484,51 +20895,39 @@ 
         <enumerator name='__destroy_functor' value='3'/>
       </enum-decl>
       <class-decl name='unordered_map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1367'>
-
           <member-type access='private'>
             <typedef-decl name='_Hashtable' type-id='type-id-2799' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-2798'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-700' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='107' column='1' id='type-id-1380'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2800' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='108' column='1' id='type-id-1386'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='mapped_type' type-id='type-id-1002' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1383'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='hasher' type-id='type-id-2196' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1374'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_equal' type-id='type-id-697' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1377'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-694' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1371'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2802' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='121' column='1' id='type-id-2801'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2804' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-2803'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='local_iterator' type-id='type-id-2806' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='123' column='1' id='type-id-2805'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_local_iterator' type-id='type-id-2808' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='124' column='1' id='type-id-2807'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2810' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2809'/>
           </member-type>
@@ -21922,63 +21321,48 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1013'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-949'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-968'/>
-
           <member-type access='private'>
             <typedef-decl name='__bucket_type' type-id='type-id-1854' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1667'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2183' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='302' column='1' id='type-id-2810'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__node_base' type-id='type-id-1857' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1671'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__node_type' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='188' column='1' id='type-id-1673'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__hashtable_alloc' type-id='type-id-968' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1669'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='202' column='1' id='type-id-700'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1294' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='203' column='1' id='type-id-2800'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1090' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-694'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_equal' type-id='type-id-1153' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-697'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__rehash_state' type-id='type-id-2207' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-691'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__hash_code' type-id='type-id-2184' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-2814'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2186' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='305' column='1' id='type-id-2802'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2188' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-2804'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='local_iterator' type-id='type-id-2190' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='308' column='1' id='type-id-2806'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_local_iterator' type-id='type-id-2192' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='310' column='1' id='type-id-2808'/>
           </member-type>
@@ -22617,14 +22001,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1962' column='1' id='type-id-2816'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2811' filepath='/usr/include/c++/4.9/type_traits' line='1963' column='1' id='type-id-2195'/>
           </member-type>
       </class-decl>
       <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2811'/>
       <class-decl name='tuple_element&lt;1ul, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/utility' line='97' column='1' id='type-id-2817'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1600' filepath='/usr/include/c++/4.9/utility' line='98' column='1' id='type-id-2200'/>
           </member-type>
@@ -22632,7 +22014,6 @@ 
       <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2205'/>
       <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1081'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-170'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2206'/>
           </member-type>
@@ -22741,24 +22122,19 @@ 
       <class-decl name='pair&lt;std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2813'/>
       <typedef-decl name='__umap_hashtable' type-id='type-id-687' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='52' column='1' id='type-id-2799'/>
       <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1360'>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2818'>
-
                 <member-type access='public'>
                   <typedef-decl name='type' type-id='type-id-1979' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2819'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1342' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2820'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2819' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2821'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='deleter_type' type-id='type-id-1149' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1364'/>
           </member-type>
@@ -22893,25 +22269,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2824'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1151' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2822'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2825'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1149' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2091'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2826'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1978' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2823'/>
           </member-type>
       </class-decl>
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-2016'>
-
           <member-type access='public'>
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='533' column='1' id='type-id-2020'>
               <data-member access='private' static='yes'>
@@ -22935,19 +22307,15 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='fmtflags' type-id='type-id-2827' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='255' column='1' id='type-id-1201'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iostate' type-id='type-id-2828' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='330' column='1' id='type-id-1203'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='openmode' type-id='type-id-2211' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='361' column='1' id='type-id-1205'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='seekdir' type-id='type-id-2829' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='393' column='1' id='type-id-1207'/>
           </member-type>
@@ -23087,7 +22455,6 @@ 
       <class-decl name='function&lt;mongo::Status(mongo::InitializerContext*)&gt;' size-in-bits='256' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2142' column='1' id='type-id-1157'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2831'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-684'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-222' filepath='/usr/include/c++/4.9/functional' line='2398' column='1' id='type-id-2832'/>
           </member-type>
@@ -23180,47 +22547,36 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;mongo::InitializerContext*, mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2833'/>
       <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1233'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-757' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2834'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1' id='type-id-1240'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='mapped_type' type-id='type-id-1564' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1243'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1290' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='101' column='1' id='type-id-1246'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2835'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1087' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='103' column='1' id='type-id-1237'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2837' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2836'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2839' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2838'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2841' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='151' column='1' id='type-id-2840'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2843' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='153' column='1' id='type-id-2842'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2845' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='154' column='1' id='type-id-2844'/>
           </member-type>
@@ -23584,7 +22940,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-757'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1725'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1072'/>
@@ -23627,59 +22982,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='366' column='1' id='type-id-2841'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-2851' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-761'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='354' column='1' id='type-id-1721'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1' id='type-id-2852'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-767'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1290' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1' id='type-id-770'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-772' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2853'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1752' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2854'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-827' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2855'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1087' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-764'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2856' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-2837'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2857' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2839'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2858' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='587' column='1' id='type-id-2843'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2859' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2845'/>
           </member-type>
@@ -24296,35 +23637,27 @@ 
       </class-decl>
       <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-824'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2860'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2861' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1967'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2863' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2862'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2862' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2864'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2866' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2865'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2865' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2867'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2869' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2868'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2868' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2870'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2872' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2871'/>
           </member-type>
@@ -24420,22 +23753,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1087'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-174'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2869'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2061' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2863'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1290' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2861'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2874'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1072' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2875'/>
                 </member-type>
@@ -24464,15 +23792,12 @@ 
       </class-decl>
       <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1290'/>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2876'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2061' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2877'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2873'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2866'/>
           </member-type>
@@ -24484,13 +23809,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2878'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1290' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1903'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2879'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2875' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2872'/>
           </member-type>
@@ -24537,31 +23860,24 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2882'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2408' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1963'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2407' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2883'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2883' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2884'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2886' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2885'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2885' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2887'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2406' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2888'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2888' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2889'/>
           </member-type>
@@ -24670,15 +23986,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2891'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2892'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2890'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2886'/>
           </member-type>
@@ -24690,7 +24003,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2893'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-832' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1899'/>
           </member-type>
@@ -24740,7 +24052,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;long unsigned int, 2ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1195'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2896'/>
           </member-type>
@@ -24755,7 +24066,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='451' column='1' id='type-id-2047'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-1281'/>
           </member-type>
@@ -24860,7 +24170,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='integral_constant&lt;long int, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1192'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-23' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2898'/>
           </member-type>
@@ -24875,7 +24184,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;long int, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1183'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-23' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2899'/>
           </member-type>
@@ -24914,7 +24222,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='integral_constant&lt;long int, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1189'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-23' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2903'/>
           </member-type>
@@ -24937,7 +24244,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='integral_constant&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1198'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2905'/>
           </member-type>
@@ -24960,7 +24266,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='integral_constant&lt;long int, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1186'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-23' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2907'/>
           </member-type>
@@ -24976,26 +24281,21 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/usr/include/c++/4.9/cstdlib' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-33'/>
         <parameter type-id='type-id-33'/>
         <return type-id='type-id-59'/>
       </function-decl>
       <class-decl name='__normal_iterator&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-132'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-1107' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2790'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2226' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2908'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2229' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2909'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2228' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2910'/>
           </member-type>
@@ -25108,19 +24408,15 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='__normal_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-135'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_type' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2793'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2232' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2911'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2234' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2912'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2233' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2913'/>
           </member-type>
@@ -25233,23 +24529,18 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-144'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2914'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-71' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2915'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-84' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2916'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-215' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2917'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-361' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2918'/>
           </member-type>
@@ -25311,15 +24602,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-129'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2236' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2919'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2238' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2920'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2237' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2921'/>
           </member-type>
@@ -25420,15 +24708,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-126'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2240' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2922'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2242' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2923'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2241' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2924'/>
           </member-type>
@@ -25529,23 +24814,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-148'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2925'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1592' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2926'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1590' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2927'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1591' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2928'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1589' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2929'/>
           </member-type>
@@ -25608,26 +24888,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2930'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2275'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1957' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-116'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2277' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2268'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-117' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2253'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-243' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2255'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2931'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2283' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2269'/>
                 </member-type>
@@ -25680,23 +24954,18 @@ 
       <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;**, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2257'/>
       <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;* const*, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2259'/>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-160'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2932'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1708' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2933'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-740' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2934'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1707' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2935'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-739' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2936'/>
           </member-type>
@@ -25778,23 +25047,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-156'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2937'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1634' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2938'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-585' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2939'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1633' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2940'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-584' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2941'/>
           </member-type>
@@ -25856,23 +25120,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-158'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2942'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1706' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2943'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-736' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2944'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1705' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2945'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-735' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2946'/>
           </member-type>
@@ -25954,23 +25213,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-172'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2947'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2948'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1107' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2949'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1983' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2950'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1106' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2951'/>
           </member-type>
@@ -26067,23 +25321,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-162'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2952'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1750' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2953'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-823' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2954'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1749' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2955'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-822' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2956'/>
           </member-type>
@@ -26146,35 +25395,27 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2957'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2363'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1965' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2365' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2354'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-123' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2345'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-249' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2347'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2958'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2371' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2355'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2959'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2371' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2610'/>
                 </member-type>
@@ -26225,23 +25466,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-168'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2960'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1756' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2961'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-835' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2962'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1755' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2963'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-834' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2964'/>
           </member-type>
@@ -26354,10 +25590,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2965'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2417'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2966'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2428' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2399'/>
                 </member-type>
@@ -26408,23 +25642,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-180'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2967'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2968'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1305' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2969'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2068' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2970'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1304' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2971'/>
           </member-type>
@@ -26486,23 +25715,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-182'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2972'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2105' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2973'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1333' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2974'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2103' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2975'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1332' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2976'/>
           </member-type>
@@ -26571,23 +25795,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-150'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2977'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1622' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2978'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1620' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2979'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1621' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2980'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1619' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2981'/>
           </member-type>
@@ -26650,26 +25869,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2982'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2496'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1959' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-118'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2498' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2489'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-119' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2476'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-245' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2478'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2983'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2504' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2490'/>
                 </member-type>
@@ -26722,23 +25935,18 @@ 
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::Constraint**, std::vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2480'/>
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::Constraint* const*, std::vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2482'/>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-152'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2984'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1630' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2985'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1628' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2986'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1629' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2987'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1627' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2988'/>
           </member-type>
@@ -26801,26 +26009,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2989'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2534'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1961' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2536' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2527'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-121' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2514'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-247' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2516'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2990'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2542' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2528'/>
                 </member-type>
@@ -26873,23 +26075,18 @@ 
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::KeyConstraint**, std::vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2518'/>
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::KeyConstraint* const*, std::vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2520'/>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-166'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2991'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1754' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2992'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-831' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2993'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1753' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2994'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-830' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2995'/>
           </member-type>
@@ -26982,10 +26179,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2996'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2578'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2997'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2589' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2566'/>
                 </member-type>
@@ -27036,23 +26231,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-178'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-2998'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2067' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2999'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1301' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3000'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2065' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3001'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1300' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3002'/>
           </member-type>
@@ -27115,26 +26305,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3003'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2630'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1973' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-124'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2464'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-125' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2451'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-251' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2453'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3004'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2638' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2465'/>
                 </member-type>
@@ -27187,23 +26371,18 @@ 
       <class-decl name='__normal_iterator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*, std::vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2455'/>
       <class-decl name='__normal_iterator&lt;const std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*, std::vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2457'/>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-154'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3005'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1632' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3006'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-581' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3007'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1631' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3008'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-580' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3009'/>
           </member-type>
@@ -27265,23 +26444,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-140'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3010'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3011'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-356' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3012'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-210' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3013'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-355' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3014'/>
           </member-type>
@@ -27344,26 +26518,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3015'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2670'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1953' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-112'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2672' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2663'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-113' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2650'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-239' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2652'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3016'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2678' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2664'/>
                 </member-type>
@@ -27416,23 +26584,18 @@ 
       <class-decl name='__normal_iterator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;*, std::vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2654'/>
       <class-decl name='__normal_iterator&lt;const boost::shared_ptr&lt;boost::program_options::option_description&gt;*, std::vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2656'/>
       <class-decl name='new_allocator&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-146'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3017'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2175' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3018'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1480' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3019'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2174' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3020'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1479' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3021'/>
           </member-type>
@@ -27494,23 +26657,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-138'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3022'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-187' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3023'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3024'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-186' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3025'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-333' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3026'/>
           </member-type>
@@ -27572,23 +26730,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-142'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3027'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3028'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-359' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3029'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-213' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3030'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-358' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3031'/>
           </member-type>
@@ -27651,26 +26804,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3032'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2745'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1955' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-114'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2747' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2738'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-115' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2725'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-241' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2727'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3033'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2753' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2739'/>
                 </member-type>
@@ -27753,23 +26900,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-170'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3034'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1848' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3035'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-964' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3036'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1847' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3037'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-963' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3038'/>
           </member-type>
@@ -27831,23 +26973,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-176'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3039'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2064' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3040'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1297' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3041'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2062' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3042'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1296' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3043'/>
           </member-type>
@@ -27909,23 +27046,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-164'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3044'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1752' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3045'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-827' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3046'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1751' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3047'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-826' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3048'/>
           </member-type>
@@ -27988,10 +27120,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3049'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2860'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3050'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2871' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2851'/>
                 </member-type>
@@ -28042,23 +27172,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-174'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-3051'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2061' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3052'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1293' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3053'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2060' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3054'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1292' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3055'/>
           </member-type>
@@ -28233,7 +27358,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <namespace-decl name='optionenvironment'>
         <class-decl name='OptionSection' size-in-bits='320' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='77' column='1' id='type-id-582'>
           <data-member access='private' layout-offset-in-bits='0'>
@@ -28526,7 +27650,6 @@ 
           <enumerator name='Switch' value='9'/>
         </enum-decl>
         <class-decl name='Value' size-in-bits='768' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='66' column='1' id='type-id-586'>
-
             <member-type access='private'>
               <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='140' column='1' id='type-id-3066'>
                 <data-member access='private'>
@@ -28549,7 +27672,6 @@ 
                 </data-member>
               </union-decl>
             </member-type>
-
             <member-type access='private'>
               <enum-decl name='Type' filepath='src/mongo/util/options_parser/value.h' line='150' column='1' id='type-id-3067'>
                 <underlying-type type-id='type-id-40'/>
@@ -28960,7 +28082,6 @@ 
           <return type-id='type-id-5'/>
         </function-decl>
         <class-decl name='ByteOrderConverter&lt;signed char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/platform/endian.h' line='259' column='1' id='type-id-3068'>
-
             <member-type access='public'>
               <typedef-decl name='T' type-id='type-id-102' filepath='src/mongo/platform/endian.h' line='260' column='1' id='type-id-3069'/>
             </member-type>
@@ -28990,7 +28111,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='ByteOrderConverter&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/platform/endian.h' line='301' column='1' id='type-id-3070'>
-
             <member-type access='public'>
               <typedef-decl name='T' type-id='type-id-67' filepath='src/mongo/platform/endian.h' line='302' column='1' id='type-id-3071'/>
             </member-type>
@@ -29124,15 +28244,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-555'>
-
             <member-type access='private'>
               <typedef-decl name='AppenderVector' type-id='type-id-1416' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-3072'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='Event' type-id='type-id-568' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-559'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='AppenderAutoPtr' type-id='type-id-2300' filepath='src/mongo/logger/log_domain.h' line='85' column='1' id='type-id-3073'/>
             </member-type>
@@ -29417,7 +28534,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-548'>
-
             <member-type access='public'>
               <enum-decl name='Value' filepath='src/mongo/logger/log_component.h' line='45' column='1' id='type-id-3075'>
                 <underlying-type type-id='type-id-40'/>
@@ -29568,7 +28684,6 @@ 
           <return type-id='type-id-1594'/>
         </function-decl>
         <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-562'>
-
             <member-type access='private'>
               <typedef-decl name='DomainsByNameMap' type-id='type-id-1367' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-3076'/>
             </member-type>
@@ -30088,7 +29203,6 @@ 
       </class-decl>
       <typedef-decl name='Milliseconds' type-id='type-id-2209' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-3078'/>
       <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-525'>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-84' filepath='src/mongo/base/string_data.h' line='157' column='1' id='type-id-3079'/>
           </member-type>
@@ -30258,7 +29372,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-517'>
-
           <member-type access='private'>
             <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1574'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -30468,7 +29581,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-379'>
-
           <member-type access='public'>
             <typedef-decl name='WordType' type-id='type-id-25' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-3081'/>
           </member-type>
@@ -30547,7 +29659,6 @@ 
       </class-decl>
       <typedef-decl name='AtomicUInt32' type-id='type-id-379' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-3080'/>
       <class-decl name='ErrorCodes' size-in-bits='8' visibility='default' filepath='build/debug/mongo/base/error_codes.h' line='45' column='1' id='type-id-3082'>
-
           <member-type access='public'>
             <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='47' column='1' id='type-id-450'>
               <underlying-type type-id='type-id-40'/>
@@ -30749,9 +29860,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-
       <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-510'>
-
           <member-type access='public'>
             <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-514'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -30859,7 +29968,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
       <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-398'>
-
           <member-type access='public'>
             <class-decl name='SorterDeserializeSettings' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='569' column='1' id='type-id-402'/>
           </member-type>
@@ -31893,7 +31001,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-446'>
-
           <member-type access='public'>
             <class-decl name='Value' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/platform/decimal128.h' line='82' column='1' id='type-id-3085'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -31904,7 +31011,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <enum-decl name='RoundingMode' filepath='src/mongo/platform/decimal128.h' line='87' column='1' id='type-id-3086'>
               <underlying-type type-id='type-id-40'/>
@@ -31915,7 +31021,6 @@ 
               <enumerator name='kRoundTiesToAway' value='4'/>
             </enum-decl>
           </member-type>
-
           <member-type access='public'>
             <enum-decl name='SignalingFlag' filepath='src/mongo/platform/decimal128.h' line='108' column='1' id='type-id-3087'>
               <underlying-type type-id='type-id-40'/>
@@ -32269,7 +31374,6 @@ 
         <enumerator name='JS' value='2'/>
       </enum-decl>
       <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-394'>
-
           <member-type access='public'>
             <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-3088'/>
           </member-type>
@@ -32928,7 +32032,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-496'>
-
           <member-type access='public'>
             <class-decl name='InstanceUnique' size-in-bits='40' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='176' column='1' id='type-id-3090'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -32942,7 +32045,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='Increment' size-in-bits='24' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='181' column='1' id='type-id-3091'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -32955,11 +32057,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='no_initialize_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='207' column='1' id='type-id-3092'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='Timestamp' type-id='type-id-67' filepath='src/mongo/bson/oid.h' line='173' column='1' id='type-id-3093'/>
           </member-type>
@@ -33157,7 +32257,6 @@ 
       </class-decl>
       <class-decl name='SecureRandom' visibility='default' is-declaration-only='yes' id='type-id-1561'/>
       <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-430'>
-
           <member-type access='public'>
             <typedef-decl name='bytes_type' type-id='type-id-84' filepath='src/mongo/base/data_view.h' line='41' column='1' id='type-id-3094'/>
           </member-type>
@@ -33234,7 +32333,6 @@ 
       </class-decl>
       <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-437'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-430'/>
-
           <member-type access='public'>
             <typedef-decl name='bytes_type' type-id='type-id-71' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-3095'/>
           </member-type>
@@ -33732,11 +32830,9 @@ 
         <return type-id='type-id-517'/>
       </function-decl>
       <class-decl name='InitializerContext' size-in-bits='576' visibility='default' filepath='src/mongo/base/initializer_context.h' line='43' column='1' id='type-id-465'>
-
           <member-type access='public'>
             <typedef-decl name='ArgumentVector' type-id='type-id-1446' filepath='src/mongo/base/initializer_context.h' line='47' column='1' id='type-id-469'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='EnvironmentMap' type-id='type-id-1265' filepath='src/mongo/base/initializer_context.h' line='48' column='1' id='type-id-472'/>
           </member-type>
@@ -34589,7 +33685,6 @@ 
       <class-decl name='MinKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='124' column='1' id='type-id-490'/>
       <class-decl name='MaxKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='126' column='1' id='type-id-487'/>
       <class-decl name='Labeler' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='130' column='1' id='type-id-1547'>
-
           <member-type access='public'>
             <class-decl name='Label' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='132' column='1' id='type-id-475'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -34627,7 +33722,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='BSONSizeTracker' size-in-bits='352' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='271' column='1' id='type-id-419'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/mongo/bson/bsonmisc.h' line='299' column='1' id='type-id-3098'>
               <underlying-type type-id='type-id-40'/>
@@ -35157,7 +34251,6 @@ 
       </class-decl>
       <class-decl name='ServerParameter' visibility='default' is-declaration-only='yes' id='type-id-1563'/>
       <class-decl name='ServerParameterSet' size-in-bits='384' visibility='default' filepath='src/mongo/db/server_parameters.h' line='90' column='1' id='type-id-504'>
-
           <member-type access='public'>
             <typedef-decl name='Map' type-id='type-id-1233' filepath='src/mongo/db/server_parameters.h' line='92' column='1' id='type-id-507'/>
           </member-type>
@@ -35369,7 +34462,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='DataType' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type.h' line='41' column='1' id='type-id-3099'>
-
           <member-type access='public'>
             <class-decl name='Handler&lt;mongo::LittleEndian&lt;int&gt;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='120' column='1' id='type-id-3100'>
               <member-function access='public' static='yes'>
@@ -35415,7 +34507,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='Handler&lt;int, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type.h' line='57' column='1' id='type-id-3101'>
               <member-function access='public' static='yes'>
@@ -35461,7 +34552,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='Handler&lt;mongo::LittleEndian&lt;char&gt;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='120' column='1' id='type-id-3102'>
               <member-function access='public' static='yes'>
@@ -35507,7 +34597,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='Handler&lt;char, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type.h' line='57' column='1' id='type-id-3103'>
               <member-function access='public' static='yes'>
@@ -35636,8 +34725,6 @@ 
       <var-decl name='scramIterationCountParam' type-id='type-id-1539' mangled-name='_ZN5mongo24scramIterationCountParamE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='196' column='1' elf-symbol-id='_ZN5mongo24scramIterationCountParamE'/>
     </namespace-decl>
     <namespace-decl name='boost'>
-
-
       <namespace-decl name='type_traits'>
         <class-decl name='ice_eq&lt;8, 16&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/detail/ice_eq.hpp' line='17' column='1' id='type-id-3104'>
           <data-member access='public' static='yes'>
@@ -35646,11 +34733,6 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-
-
-
-
-
         <class-decl name='integer_traits_base&lt;signed char, -128, 127&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-3105'>
           <data-member access='public' static='yes'>
             <var-decl name='is_integral' type-id='type-id-332' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
@@ -35762,18 +34844,7 @@ 
           </data-member>
         </class-decl>
       </namespace-decl>
-
-
-
-
-
-
-
-
       <namespace-decl name='program_options'>
-
-
-
         <class-decl name='options_description' size-in-bits='832' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='173' column='1' id='type-id-198'>
           <data-member access='public' static='yes'>
             <var-decl name='m_default_line_length' type-id='type-id-1476' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='175' column='1'/>
@@ -36010,17 +35081,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
-
-
-
-
-
-
-
-
       <class-decl name='intrusive_ptr&lt;mongo::SharedBuffer::Holder&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='52' column='1' id='type-id-194'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='px' type-id='type-id-1570' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
@@ -36162,7 +35222,6 @@ 
       <class-decl name='shared_ptr&lt;boost::program_options::option_description&gt;' visibility='default' is-declaration-only='yes' id='type-id-209'/>
       <class-decl name='shared_ptr&lt;boost::program_options::options_description&gt;' visibility='default' is-declaration-only='yes' id='type-id-212'/>
       <class-decl name='any' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='45' column='1' id='type-id-188'>
-
           <member-type access='private'>
             <class-decl name='placeholder' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='158' column='1' id='type-id-192'>
               <member-function access='public' destructor='yes' vtable-offset='-1'>
@@ -36257,7 +35316,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-29'/>
       <return type-id='type-id-68'/>
@@ -36918,7 +35976,6 @@ 
       <return type-id='type-id-96'/>
     </function-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-596'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-332' mangled-name='_ZN4mpl_5bool_ILb1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
@@ -37140,7 +36197,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <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-101'/>
     </function-decl>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index e5bf9c0c..3dfa98e7 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1720,49 +1720,28 @@ 
     <elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/replication_executor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='112' id='type-id-2'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-5'/>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='96' id='type-id-6'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='112' id='type-id-8'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-9'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='320' id='type-id-11'>
       <subrange length='40' type-id='type-id-3' id='type-id-12'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-13'>
       <subrange length='48' type-id='type-id-3' id='type-id-14'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='32' id='type-id-15'>
       <subrange length='4' type-id='type-id-3' id='type-id-16'/>
-
     </array-type-def>
     <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-17'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1780,31 +1759,24 @@ 
     </class-decl>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='120' id='type-id-21'>
       <subrange length='15' type-id='type-id-3' id='type-id-22'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='152' id='type-id-23'>
       <subrange length='19' type-id='type-id-3' id='type-id-24'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='160' id='type-id-25'>
       <subrange length='20' type-id='type-id-3' id='type-id-26'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='176' id='type-id-27'>
       <subrange length='22' type-id='type-id-3' id='type-id-28'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='56' id='type-id-29'>
       <subrange length='7' type-id='type-id-3' id='type-id-30'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='64' id='type-id-31'>
       <subrange length='8' type-id='type-id-3' id='type-id-32'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='96' id='type-id-34'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='type-id-35'/>
     <type-decl name='float' size-in-bits='32' id='type-id-36'/>
@@ -1820,15 +1792,12 @@ 
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-45'/>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='128' id='type-id-46'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='256' id='type-id-47'>
       <subrange length='32' type-id='type-id-3' id='type-id-48'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-45' size-in-bits='768' id='type-id-49'>
       <subrange length='96' type-id='type-id-3' id='type-id-50'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-18'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-51'/>
@@ -1954,7 +1923,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-88' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-89'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-90' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-88'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-88' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-90'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-91'>
             <data-member access='private'>
@@ -4083,7 +4051,6 @@ 
       <namespace-decl name='chrono'>
         <namespace-decl name='_V2'>
           <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='716' column='1' id='type-id-2774'>
-
               <member-type access='public'>
                 <typedef-decl name='time_point' type-id='type-id-1187' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='721' column='1' id='type-id-1163'/>
               </member-type>
@@ -4110,7 +4077,6 @@ 
           </class-decl>
         </namespace-decl>
         <class-decl name='duration&lt;long, std::ratio&lt;1, 1000&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/chrono' line='241' column='1' id='type-id-1173'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='243' column='1' id='type-id-1177'/>
             </member-type>
@@ -4265,7 +4231,6 @@ 
           <return type-id='type-id-1'/>
         </function-decl>
         <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &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/chrono' line='546' column='1' id='type-id-1187'>
-
             <member-type access='public'>
               <typedef-decl name='duration' type-id='type-id-1166' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='549' column='1' id='type-id-1190'/>
             </member-type>
@@ -4317,7 +4282,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long, std::ratio&lt;1, 1000000000&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/chrono' line='241' column='1' id='type-id-1166'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='243' column='1' id='type-id-1170'/>
             </member-type>
@@ -4440,7 +4404,6 @@ 
         </class-decl>
         <typedef-decl name='milliseconds' type-id='type-id-1173' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='533' column='1' id='type-id-2776'/>
         <class-decl name='duration&lt;long, std::ratio&lt;1, 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/chrono' line='241' column='1' id='type-id-1180'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='243' column='1' id='type-id-1184'/>
             </member-type>
@@ -4572,12 +4535,10 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='enable_if&lt;true, std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &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='1953' column='1' id='type-id-2779'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1173' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-2775'/>
           </member-type>
       </class-decl>
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='77' column='1' id='type-id-1050'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -4624,43 +4585,33 @@ 
         <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&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/hashtable_policy.h' line='1646' column='1' id='type-id-1029'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1009'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1038'/>
-
             <member-type access='public'>
               <typedef-decl name='__hash_code' type-id='type-id-2781' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2780'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-1012' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-2141'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-1160' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1652' column='1' id='type-id-2782'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1689' column='1' id='type-id-2783'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-1285' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2785'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='iterator' type-id='type-id-2787' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1670' column='1' id='type-id-2786'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_iterator' type-id='type-id-2789' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1674' column='1' id='type-id-2788'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='size_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1655' column='1' id='type-id-2790'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='local_iterator' type-id='type-id-2792' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1678' column='1' id='type-id-2791'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_local_iterator' type-id='type-id-2794' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1683' column='1' id='type-id-2793'/>
             </member-type>
@@ -4708,15 +4659,12 @@ 
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1032'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1041'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1044'/>
-
             <member-type access='public'>
               <typedef-decl name='hasher' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2795'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__hash_code' type-id='type-id-57' 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-2781'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-1015' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-1012'/>
             </member-type>
@@ -4885,15 +4833,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Mod_range_hashing' 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/hashtable_policy.h' line='440' column='1' id='type-id-1062'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='444' column='1' id='type-id-2796'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='first_argument_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-2797'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='second_argument_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-2798'/>
             </member-type>
@@ -4993,11 +4938,9 @@ 
         <class-decl name='_Local_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2792'/>
         <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2794'/>
         <class-decl name='_Map_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, 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/hashtable_policy.h' line='548' column='1' id='type-id-1053'>
-
             <member-type access='public'>
               <typedef-decl name='mapped_type' type-id='type-id-2799' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-1059'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-2782' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-1056'/>
             </member-type>
@@ -5034,23 +4977,18 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2153'/>
         </class-decl>
         <class-decl name='_Insert_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&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/hashtable_policy.h' line='685' column='1' id='type-id-2153'>
-
             <member-type access='public'>
               <typedef-decl name='__hashtable' type-id='type-id-517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='688' column='1' id='type-id-2155'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2783' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-2801'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-2785' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-1047'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='iterator' type-id='type-id-2786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='697' column='1' id='type-id-2802'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_iterator' type-id='type-id-2788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='698' column='1' id='type-id-2803'/>
             </member-type>
@@ -5106,7 +5044,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Equality&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, 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/hashtable_policy.h' line='1803' column='1' id='type-id-1003'>
-
             <member-type access='public'>
               <typedef-decl name='__hashtable' type-id='type-id-517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1806' column='1' id='type-id-1006'/>
             </member-type>
@@ -5120,19 +5057,15 @@ 
         </class-decl>
         <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &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/hashtable_policy.h' line='1889' column='1' id='type-id-1022'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1035'/>
-
             <member-type access='public'>
               <typedef-decl name='__node_alloc_type' type-id='type-id-1147' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-1026'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-2805' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1894' column='1' id='type-id-2137'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__bucket_type' type-id='type-id-111' 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-2806'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_base' type-id='type-id-113' 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-2807'/>
             </member-type>
@@ -5214,7 +5147,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-1066'>
-
             <member-type access='public'>
               <typedef-decl name='_State' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2808'/>
             </member-type>
@@ -5284,11 +5216,7 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
       <class-decl name='_Bind_helper&lt;false, mongo::OperationContext *(mongo::repl::StorageInterface::*)(), mongo::repl::StorageInterface *&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-2809'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2810'/>
           </member-type>
@@ -5367,39 +5295,30 @@ 
       <class-decl name='unary_function&lt;mongo::repl::StorageInterface *, mongo::OperationContext *&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='105' column='1' id='type-id-2816'/>
       <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-1432'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-987'/>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1125' 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-1436'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1641' 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-1439'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-2818' 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-2817'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-2820' 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-2819'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2822' 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-2821'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2824' 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-2823'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2826' 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-2825'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2828' 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-2827'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2830' 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-2829'/>
           </member-type>
@@ -5882,7 +5801,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-987'>
-
           <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-2120'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1125'/>
@@ -5924,15 +5842,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2834' 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-990'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2835' 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-2830'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1125' 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-993'/>
           </member-type>
@@ -6037,35 +5952,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-2836'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2837' 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-2219'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2839' 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-2838'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-2840' 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-2839'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2842' 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-2841'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-2843' 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-2842'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2845' 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-2844'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2846' 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-2845'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-2848' 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-2847'/>
           </member-type>
@@ -6161,22 +6068,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-1125'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-130'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1641' 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-2837'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1646' 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-2840'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-2843'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&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/allocator.h' line='104' column='1' id='type-id-2853'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1125' 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-2854'/>
                 </member-type>
@@ -6205,23 +6107,18 @@ 
       <typedef-decl name='size_t' type-id='type-id-51' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-57'/>
       <typedef-decl name='__allocator_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-130' 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-2855'/>
       <class-decl name='pointer_traits&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&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/ptr_traits.h' line='150' column='1' id='type-id-2856'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1646' 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-2857'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-1644' 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-2849'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-2850'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-2846'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-2851'/>
           </member-type>
@@ -6233,38 +6130,32 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&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/ptr_traits.h' line='105' column='1' id='type-id-2859'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1641' 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-2171'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-2858'/>
       <class-decl name='make_unsigned&lt;long&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='1666' column='1' id='type-id-2860'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2861' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1667' column='1' id='type-id-2852'/>
           </member-type>
       </class-decl>
       <class-decl name='__make_unsigned_selector&lt;long, true, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1634' column='1' id='type-id-2862'>
-
           <member-type access='private'>
             <typedef-decl name='__type' type-id='type-id-2863' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1641' column='1' id='type-id-2861'/>
           </member-type>
       </class-decl>
       <class-decl name='__match_cv_qualifiers&lt;long, unsigned long, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1578' column='1' id='type-id-2864'>
-
           <member-type access='private'>
             <typedef-decl name='__type' type-id='type-id-2865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2863'/>
           </member-type>
       </class-decl>
       <class-decl name='__cv_selector&lt;unsigned long, false, 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/type_traits' line='1560' column='1' id='type-id-2866'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-51' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1561' column='1' id='type-id-2865'/>
           </member-type>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, 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/type_traits' line='69' column='1' id='type-id-1244'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='72' column='1' id='type-id-2867'/>
           </member-type>
@@ -6280,7 +6171,6 @@ 
       </class-decl>
       <typedef-decl name='false_type' type-id='type-id-1244' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='90' column='1' id='type-id-2833'/>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, 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-2868'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2854' 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-2848'/>
           </member-type>
@@ -6289,7 +6179,6 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2822'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2824'/>
       <class-decl name='integral_constant&lt;bool, 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='69' column='1' id='type-id-1247'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='72' column='1' id='type-id-2869'/>
           </member-type>
@@ -6306,7 +6195,6 @@ 
       <typedef-decl name='true_type' type-id='type-id-1247' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='87' column='1' id='type-id-2832'/>
       <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='617' column='1' id='type-id-1157'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-996'/>
-
           <member-type access='public'>
             <typedef-decl name='__integral_type' type-id='type-id-18' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='619' column='1' id='type-id-2870'/>
           </member-type>
@@ -6352,7 +6240,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-996'>
-
           <member-type access='public'>
             <typedef-decl name='__int_type' type-id='type-id-18' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-2125'/>
           </member-type>
@@ -7241,24 +7128,19 @@ 
       </class-decl>
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/new' line='99' column='1' id='type-id-2875'/>
       <class-decl name='unique_ptr&lt;mongo::executor::NetworkInterface, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1382'>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1334' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2879'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2881' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2880'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2882'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-1610' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2881'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-1196' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1386'/>
           </member-type>
@@ -7454,7 +7336,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&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-747'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-855'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-548'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-750'/>
           </member-type>
@@ -7543,7 +7424,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&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-855'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-587'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-858'/>
           </member-type>
@@ -7717,7 +7597,6 @@ 
       <class-decl name='allocator_arg_t' 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/uses_allocator.h' line='39' column='1' id='type-id-2885'/>
       <class-decl name='__uses_alloc0' 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/uses_allocator.h' line='69' column='1' id='type-id-2886'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2887'/>
-
           <member-type access='public'>
             <class-decl name='_Anything' 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/uses_allocator.h' line='70' column='1' id='type-id-2198'>
               <member-function access='public' constructor='yes'>
@@ -7794,42 +7673,34 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, const std::default_delete&lt;mongo::executor::NetworkInterface&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='1967' column='1' id='type-id-2888'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1198' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2883'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::executor::NetworkInterface&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-2889'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1196' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2509'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::NetworkInterface, 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='1516' column='1' id='type-id-2890'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1609' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2884'/>
           </member-type>
       </class-decl>
       <class-decl name='unique_ptr&lt;mongo::repl::StorageInterface, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1389'>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1349' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2891'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2893' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2892'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2894'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-1685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2893'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-1200' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1393'/>
           </member-type>
@@ -8025,7 +7896,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&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-777'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-861'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-557'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-861' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-780'/>
           </member-type>
@@ -8114,7 +7984,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&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-861'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-590'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-864'/>
           </member-type>
@@ -8337,25 +8206,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::repl::StorageInterface&gt;, const std::default_delete&lt;mongo::repl::StorageInterface&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='1967' column='1' id='type-id-2897'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1202' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2895'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::repl::StorageInterface&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-2898'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1200' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2512'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::StorageInterface, 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='1516' column='1' id='type-id-2899'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1684' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2896'/>
           </member-type>
       </class-decl>
       <class-decl name='thread' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='60' column='1' id='type-id-1311'>
-
           <member-type access='private'>
             <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='68' column='1' id='type-id-2616'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -8376,11 +8241,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-66' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='63' column='1' id='type-id-2900'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Impl_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='97' column='1' id='type-id-2613'>
               <data-member access='public' layout-offset-in-bits='64'>
@@ -8400,11 +8263,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__shared_base_type' type-id='type-id-1304' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='65' column='1' id='type-id-2901'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='107' column='1' id='type-id-1315'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2613'/>
@@ -8711,7 +8572,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl_base, 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='1516' column='1' id='type-id-2903'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2902'/>
           </member-type>
@@ -8839,7 +8699,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&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/functional' line='1663' column='1' id='type-id-511'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-2906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1665' column='1' id='type-id-2905'/>
           </member-type>
@@ -8939,7 +8798,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, (lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&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-717'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-533'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-720'/>
           </member-type>
@@ -9091,14 +8949,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__success_type&lt;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/type_traits' line='154' column='1' id='type-id-2908'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-53' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='155' column='1' id='type-id-2906'/>
           </member-type>
       </class-decl>
       <class-decl name='_Index_tuple&lt;&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/utility' line='206' column='1' id='type-id-2907'/>
       <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, 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='1516' column='1' id='type-id-2909'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2611' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2904'/>
           </member-type>
@@ -9107,15 +8963,12 @@ 
       <class-decl name='_Sp_make_shared_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='491' column='1' id='type-id-2877'/>
       <class-decl name='allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &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-1153'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-148'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1315' 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-2910'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2612' 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-2911'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-2912'/>
           </member-type>
@@ -9198,7 +9051,6 @@ 
       <class-decl name='weak_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1451'/>
       <class-decl name='mutex' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='118' column='1' id='type-id-1279'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1076'/>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-2170' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='121' column='1' id='type-id-2914'/>
           </member-type>
@@ -9254,7 +9106,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__mutex_base' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='57' column='1' id='type-id-1076'>
-
           <member-type access='private'>
             <typedef-decl name='__native_type' type-id='type-id-68' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='60' column='1' id='type-id-2169'/>
           </member-type>
@@ -9283,11 +9134,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='condition_variable' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='64' column='1' id='type-id-1193'>
-
           <member-type access='private'>
             <typedef-decl name='__native_type' type-id='type-id-75' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='67' column='1' id='type-id-2248'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-2249' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='76' column='1' id='type-id-2915'/>
           </member-type>
@@ -9347,7 +9196,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='394' column='1' id='type-id-1378'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-1279' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='397' column='1' id='type-id-2680'/>
           </member-type>
@@ -9483,39 +9331,30 @@ 
       <class-decl name='adopt_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='361' column='1' id='type-id-2918'/>
       <class-decl name='list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1263'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-641'/>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1132' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1267'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1273'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-673' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-1270'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2919'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2921' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2920'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2923' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2922'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2925' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2924'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2927' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2926'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node' type-id='type-id-683' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='475' column='1' id='type-id-2302'/>
           </member-type>
@@ -10005,7 +9844,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-641'>
-
           <member-type access='private'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1873'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1138'/>
@@ -10034,15 +9872,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2929' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-644'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2931' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2930'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1132' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2932'/>
           </member-type>
@@ -10127,29 +9962,23 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&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-1132'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-134'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&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/allocator.h' line='104' column='1' id='type-id-2933'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1138' 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-2929'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;mongo::repl::ReplicationExecutor::WorkItem&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-2934'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1132' 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-2931'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1678' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2925'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-465' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2927'/>
           </member-type>
@@ -10345,7 +10174,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::EventState, 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='1516' column='1' id='type-id-2936'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2935'/>
           </member-type>
@@ -10475,39 +10303,30 @@ 
       </class-decl>
       <class-decl name='list&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&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/bits/stl_list.h' line='447' column='1' id='type-id-1250'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-635'/>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1122' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1254'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-417' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1260'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-667' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-1257'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-647' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2938'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2940' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2939'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2942' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2941'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2944' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2943'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2945'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node' type-id='type-id-679' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='475' column='1' id='type-id-2292'/>
           </member-type>
@@ -11001,7 +10820,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&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/bits/stl_list.h' line='298' column='1' id='type-id-635'>
-
           <member-type access='private'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1867'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1135'/>
@@ -11030,15 +10848,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-638'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2950' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2949'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1122' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2951'/>
           </member-type>
@@ -11123,29 +10938,23 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::executor::TaskExecutor::EventHandle&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-1122'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-128'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&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/bits/allocator.h' line='104' column='1' id='type-id-2952'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1135' 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-2948'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;mongo::executor::TaskExecutor::EventHandle&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-2953'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1122' 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-2950'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2944'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2946'/>
           </member-type>
@@ -11207,19 +11016,15 @@ 
       <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' type-id='type-id-136' 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-2955'/>
       <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::EventHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-2947'/>
       <class-decl name='_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&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/bits/stl_list.h' line='125' column='1' id='type-id-667'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-667' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-670'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='134' column='1' id='type-id-2956'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1634' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='133' column='1' id='type-id-2957'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-679' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2958'/>
           </member-type>
@@ -11299,27 +11104,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&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/bits/stl_list.h' line='204' column='1' id='type-id-647'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-667' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='208' column='1' id='type-id-654'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2959'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-420' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2960'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-647' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-651'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='210' column='1' id='type-id-2961'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-2963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='211' column='1' id='type-id-2962'/>
           </member-type>
@@ -11415,7 +11214,6 @@ 
       <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2940'/>
       <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2942'/>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::ReplicationExecutor::Event, 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='1516' column='1' id='type-id-2966'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1676' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2937'/>
           </member-type>
@@ -11423,15 +11221,12 @@ 
       <class-decl name='__weak_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-1113'/>
       <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::Event&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-1128'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-132'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-459' 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-2967'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1677' 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-2968'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-2969'/>
           </member-type>
@@ -11552,19 +11347,15 @@ 
       <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' type-id='type-id-138' 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-2972'/>
       <class-decl name='initializer_list&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' visibility='default' is-declaration-only='yes' id='type-id-2928'/>
       <class-decl name='_List_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&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/bits/stl_list.h' line='125' column='1' id='type-id-673'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-673' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-676'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1678' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='134' column='1' id='type-id-2973'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1680' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='133' column='1' id='type-id-2974'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-683' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2975'/>
           </member-type>
@@ -11644,27 +11435,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&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/bits/stl_list.h' line='204' column='1' id='type-id-657'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-673' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='208' column='1' id='type-id-664'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-465' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2976'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2977'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-661'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='210' column='1' id='type-id-2978'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-2963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='211' column='1' id='type-id-2979'/>
           </member-type>
@@ -11755,7 +11540,6 @@ 
       <class-decl name='function&lt;void ()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1224'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2980'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-2733' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2981'/>
           </member-type>
@@ -11858,7 +11642,6 @@ 
       </class-decl>
       <class-decl name='_Maybe_unary_or_binary_function&lt;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/functional' line='495' column='1' id='type-id-2980'/>
       <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1837' column='1' id='type-id-514'>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;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='1844' column='1' id='type-id-2982'>
               <data-member access='protected' static='yes'>
@@ -11939,7 +11722,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&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; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2987'>
               <data-member access='protected' static='yes'>
@@ -12020,11 +11802,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Manager_type' type-id='type-id-152' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2004' column='1' id='type-id-2991'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&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='1844' column='1' id='type-id-2992'>
               <data-member access='protected' static='yes'>
@@ -12105,7 +11885,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&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='1844' column='1' id='type-id-2993'>
               <data-member access='protected' static='yes'>
@@ -12186,7 +11965,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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='1844' column='1' id='type-id-2994'>
               <data-member access='protected' static='yes'>
@@ -12267,7 +12045,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&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='1844' column='1' id='type-id-2995'>
               <data-member access='protected' static='yes'>
@@ -12348,7 +12125,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&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='1844' column='1' id='type-id-2996'>
               <data-member access='protected' static='yes'>
@@ -12429,7 +12205,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&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='1844' column='1' id='type-id-2997'>
               <data-member access='protected' static='yes'>
@@ -12510,7 +12285,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&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='1844' column='1' id='type-id-2998'>
               <data-member access='protected' static='yes'>
@@ -12591,7 +12365,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&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='1844' column='1' id='type-id-2999'>
               <data-member access='protected' static='yes'>
@@ -12672,7 +12445,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-3000'>
               <data-member access='protected' static='yes'>
@@ -12749,7 +12521,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-3001'>
               <data-member access='protected' static='yes'>
@@ -13254,7 +13025,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' 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-771'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
         <base-class access='private' layout-offset-in-bits='256' type-id='type-id-554'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-849' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-774'/>
           </member-type>
@@ -13351,7 +13121,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' 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-849'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-921'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-584'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-921' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-852'/>
           </member-type>
@@ -13446,7 +13215,6 @@ 
       <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' 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-921'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-939'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-611'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-924'/>
           </member-type>
@@ -13539,7 +13307,6 @@ 
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' 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-939'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-957'/>
         <base-class access='private' layout-offset-in-bits='128' type-id='type-id-617'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-957' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-942'/>
           </member-type>
@@ -13630,7 +13397,6 @@ 
       <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-957'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-981'/>
         <base-class access='private' layout-offset-in-bits='64' type-id='type-id-620'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-981' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-960'/>
           </member-type>
@@ -13719,7 +13485,6 @@ 
       <class-decl name='_Tuple_impl&lt;5, std::mutex *&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-981'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2113'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-632'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-984'/>
           </member-type>
@@ -14239,7 +14004,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&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-735'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-825'/>
         <base-class access='private' layout-offset-in-bits='64' type-id='type-id-542'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-825' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-738'/>
           </member-type>
@@ -14320,7 +14084,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, mongo::Status &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-825'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-575'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-828'/>
           </member-type>
@@ -14565,7 +14328,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *, mongo::Status&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-741'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-831'/>
         <base-class access='private' layout-offset-in-bits='64' type-id='type-id-545'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-831' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-744'/>
           </member-type>
@@ -14654,7 +14416,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, mongo::Status&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-831'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-578'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-834'/>
           </member-type>
@@ -15039,7 +14800,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' 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-765'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-843'/>
         <base-class access='private' layout-offset-in-bits='256' type-id='type-id-554'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-843' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-768'/>
           </member-type>
@@ -15134,7 +14894,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' 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-843'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-915'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-584'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-915' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-846'/>
           </member-type>
@@ -15227,7 +14986,6 @@ 
       <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' 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-915'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-933'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-611'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-933' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-918'/>
           </member-type>
@@ -15318,7 +15076,6 @@ 
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' 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-933'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
         <base-class access='private' layout-offset-in-bits='128' type-id='type-id-617'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-951' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-936'/>
           </member-type>
@@ -15407,7 +15164,6 @@ 
       <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-951'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-969'/>
         <base-class access='private' layout-offset-in-bits='64' type-id='type-id-620'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-969' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-954'/>
           </member-type>
@@ -15494,7 +15250,6 @@ 
       <class-decl name='_Tuple_impl&lt;5, nullptr_t&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-969'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2113'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-626'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-972'/>
           </member-type>
@@ -15755,7 +15510,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, unsigned int, unsigned int&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-819'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-891'/>
         <base-class access='private' layout-offset-in-bits='32' type-id='type-id-572'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-891' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-822'/>
           </member-type>
@@ -15836,7 +15590,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, unsigned int&gt;' size-in-bits='32' 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-891'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-602'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-894'/>
           </member-type>
@@ -16023,7 +15776,6 @@ 
       <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1236'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3025'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-2741' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-3026'/>
           </member-type>
@@ -16179,7 +15931,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' 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-759'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-837'/>
         <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-554'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-837' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-762'/>
           </member-type>
@@ -16276,7 +16027,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1024' 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-837'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-909'/>
         <base-class access='private' layout-offset-in-bits='448' type-id='type-id-581'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-909' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-840'/>
           </member-type>
@@ -16371,7 +16121,6 @@ 
       <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' 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-909'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-608'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-945' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-912'/>
           </member-type>
@@ -16464,7 +16213,6 @@ 
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' 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-945'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
         <base-class access='private' layout-offset-in-bits='320' type-id='type-id-617'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-948'/>
           </member-type>
@@ -16555,7 +16303,6 @@ 
       <class-decl name='_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='320' 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-963'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
         <base-class access='private' layout-offset-in-bits='256' type-id='type-id-623'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-975' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-966'/>
           </member-type>
@@ -16644,7 +16391,6 @@ 
       <class-decl name='_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='256' 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-975'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2113'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-629'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-978'/>
           </member-type>
@@ -17023,7 +16769,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &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-723'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-536'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-726'/>
           </member-type>
@@ -17269,7 +17014,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' 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-795'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-885'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-560'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-885' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-798'/>
           </member-type>
@@ -17360,7 +17104,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' 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-885'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-903'/>
         <base-class access='private' layout-offset-in-bits='576' type-id='type-id-599'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-903' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-888'/>
           </member-type>
@@ -17449,7 +17192,6 @@ 
       <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='576' 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-903'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2083'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-605'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-906'/>
           </member-type>
@@ -17784,7 +17526,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &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-729'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-539'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-732'/>
           </member-type>
@@ -18024,7 +17765,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' 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-789'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-879'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-560'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-879' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-792'/>
           </member-type>
@@ -18107,7 +17847,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' 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-879'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-897'/>
         <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-599'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-897' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-882'/>
           </member-type>
@@ -18189,7 +17928,6 @@ 
       <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1024' 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-897'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-927'/>
         <base-class access='private' layout-offset-in-bits='448' type-id='type-id-605'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-927' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-900'/>
           </member-type>
@@ -18270,7 +18008,6 @@ 
       <class-decl name='_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='448' 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-927'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2098'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-614'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2098' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-930'/>
           </member-type>
@@ -18477,11 +18214,9 @@ 
       <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1232'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3038'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-2738' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-3039'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Requires&lt;_Callable&lt;typename decay&lt;_Bind&lt;void (*(_Placeholder&lt;1&gt;, function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt;, RemoteCommandRequest, StatusWith&lt;RemoteCommandResponse&gt;))(const CallbackArgs &amp;, const function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt; &amp;, const RemoteCommandRequest &amp;, const StatusWith&lt;RemoteCommandResponse&gt; &amp;)&gt; &gt;::type&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' type-id='type-id-3041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2163' column='1' id='type-id-3040'/>
           </member-type>
@@ -18588,7 +18323,6 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;const mongo::executor::TaskExecutor::CallbackArgs &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='105' column='1' id='type-id-3043'/>
       <class-decl name='enable_if&lt;true, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &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='1953' column='1' id='type-id-3044'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2274' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-3041'/>
           </member-type>
@@ -18654,7 +18388,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='320' 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-753'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-551'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-756'/>
           </member-type>
@@ -18901,7 +18634,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, std::function&lt;void ()&gt; &gt;' size-in-bits='256' 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-807'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-566'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-810'/>
           </member-type>
@@ -19110,7 +18842,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackState, 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='1516' column='1' id='type-id-3047'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1629' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2876'/>
           </member-type>
@@ -19178,7 +18909,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *&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-783'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-557'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-786'/>
           </member-type>
@@ -19267,7 +18997,6 @@ 
         <return type-id='type-id-2810'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;, mongo::executor::TaskExecutor::CallbackArgs&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-3048'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-499' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3049'/>
           </member-type>
@@ -19283,7 +19012,6 @@ 
         <return type-id='type-id-1298'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&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-3050'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1298' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2546'/>
           </member-type>
@@ -19293,7 +19021,6 @@ 
         <return type-id='type-id-2547'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3051'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3052'/>
           </member-type>
@@ -19307,7 +19034,6 @@ 
         <return type-id='type-id-3052'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &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-3053'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-502' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3054'/>
           </member-type>
@@ -19320,7 +19046,6 @@ 
         <return type-id='type-id-3054'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;), mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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/functional' line='1601' column='1' id='type-id-3055'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-490' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3056'/>
           </member-type>
@@ -19335,7 +19060,6 @@ 
         <return type-id='type-id-3056'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3057'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-493' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3058'/>
           </member-type>
@@ -19349,7 +19073,6 @@ 
         <return type-id='type-id-3058'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3059'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-496' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3060'/>
           </member-type>
@@ -19374,7 +19097,6 @@ 
         <return type-id='type-id-1289'/>
       </function-decl>
       <class-decl name='remove_reference&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/type_traits' line='1504' column='1' id='type-id-3061'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2392'/>
           </member-type>
@@ -19384,7 +19106,6 @@ 
         <return type-id='type-id-2394'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&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-3062'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1292' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2542'/>
           </member-type>
@@ -19399,7 +19120,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem &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-3063'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2407'/>
           </member-type>
@@ -19409,7 +19129,6 @@ 
         <return type-id='type-id-2408'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem&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-3064'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2409'/>
           </member-type>
@@ -19419,7 +19138,6 @@ 
         <return type-id='type-id-1679'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::EventState&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-3065'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1295' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2544'/>
           </member-type>
@@ -19429,7 +19147,6 @@ 
         <return type-id='type-id-2545'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::Status &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-3066'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-369' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2373'/>
           </member-type>
@@ -19439,7 +19156,6 @@ 
         <return type-id='type-id-2375'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&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-3067'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2530'/>
           </member-type>
@@ -19449,7 +19165,6 @@ 
         <return type-id='type-id-2531'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::OperationContext *&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-3068'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1573' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2369'/>
           </member-type>
@@ -19459,7 +19174,6 @@ 
         <return type-id='type-id-1579'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const mongo::Status &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-3069'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-370' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2335'/>
           </member-type>
@@ -19469,7 +19183,6 @@ 
         <return type-id='type-id-371'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &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-3070'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-484' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3071'/>
           </member-type>
@@ -19481,7 +19194,6 @@ 
         <return type-id='type-id-3071'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&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-3072'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-484' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2419'/>
           </member-type>
@@ -19494,7 +19206,6 @@ 
         <return type-id='type-id-2622'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::OperationContext *&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-3073'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1578' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3074'/>
           </member-type>
@@ -19504,7 +19215,6 @@ 
         <return type-id='type-id-3074'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::Status&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-3075'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1588' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3076'/>
           </member-type>
@@ -19526,7 +19236,6 @@ 
         <return type-id='type-id-3074'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::OperationContext *&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-3077'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1573' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2367'/>
           </member-type>
@@ -19541,7 +19250,6 @@ 
         <return type-id='type-id-1328'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::repl::ReplicationExecutor *&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-3078'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1672' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3079'/>
           </member-type>
@@ -19551,7 +19259,6 @@ 
         <return type-id='type-id-3079'/>
       </function-decl>
       <class-decl name='__add_ref&lt;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='62' column='1' id='type-id-3080'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1899' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3081'/>
           </member-type>
@@ -19561,7 +19268,6 @@ 
         <return type-id='type-id-3081'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::_Placeholder&lt;2&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-3082'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1901' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3083'/>
           </member-type>
@@ -19571,7 +19277,6 @@ 
         <return type-id='type-id-3083'/>
       </function-decl>
       <class-decl name='__add_ref&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/tuple' line='62' column='1' id='type-id-3084'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3085'/>
           </member-type>
@@ -19581,7 +19286,6 @@ 
         <return type-id='type-id-3085'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &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-3086'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2300' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3087'/>
           </member-type>
@@ -19591,7 +19295,6 @@ 
         <return type-id='type-id-3087'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::mutex *&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-3088'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2316' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3089'/>
           </member-type>
@@ -19605,7 +19308,6 @@ 
         <return type-id='type-id-3089'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::mutex *&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-3090'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2313' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2538'/>
           </member-type>
@@ -19619,7 +19321,6 @@ 
         <return type-id='type-id-3087'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&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-3091'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2297' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2532'/>
           </member-type>
@@ -19641,7 +19342,6 @@ 
         <return type-id='type-id-3083'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::Status &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-3092'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1588' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3093'/>
           </member-type>
@@ -19659,7 +19359,6 @@ 
         <return type-id='type-id-3081'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::OperationContext *&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-3094'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1578' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3095'/>
           </member-type>
@@ -19677,7 +19376,6 @@ 
         <return type-id='type-id-3079'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&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-3096'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1669' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2403'/>
           </member-type>
@@ -19687,7 +19385,6 @@ 
         <return type-id='type-id-1672'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&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-3097'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-496' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2427'/>
           </member-type>
@@ -19697,7 +19394,6 @@ 
         <return type-id='type-id-2428'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::OperationContext *, mongo::Status&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-3098'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1331' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2550'/>
           </member-type>
@@ -19707,7 +19403,6 @@ 
         <return type-id='type-id-2551'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::Status&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-3099'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-831' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2451'/>
           </member-type>
@@ -19717,7 +19412,6 @@ 
         <return type-id='type-id-2452'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2&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-3100'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2475'/>
           </member-type>
@@ -19727,7 +19421,6 @@ 
         <return type-id='type-id-2476'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::Status&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-3101'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-369' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2376'/>
           </member-type>
@@ -19737,7 +19430,6 @@ 
         <return type-id='type-id-1589'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&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-3102'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2445'/>
           </member-type>
@@ -19747,7 +19439,6 @@ 
         <return type-id='type-id-2446'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3103'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1346' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2558'/>
           </member-type>
@@ -19757,7 +19448,6 @@ 
         <return type-id='type-id-2559'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3104'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-849' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2457'/>
           </member-type>
@@ -19767,7 +19457,6 @@ 
         <return type-id='type-id-2458'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&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-3105'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1669' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2405'/>
           </member-type>
@@ -19777,7 +19466,6 @@ 
         <return type-id='type-id-1673'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3106'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-921' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2473'/>
           </member-type>
@@ -19787,7 +19475,6 @@ 
         <return type-id='type-id-2474'/>
       </function-decl>
       <class-decl name='remove_reference&lt;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/type_traits' line='1500' column='1' id='type-id-3107'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-696' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2447'/>
           </member-type>
@@ -19797,7 +19484,6 @@ 
         <return type-id='type-id-1900'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3108'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2481'/>
           </member-type>
@@ -19807,7 +19493,6 @@ 
         <return type-id='type-id-2482'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Placeholder&lt;2&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-3109'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-699' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2449'/>
           </member-type>
@@ -19817,7 +19502,6 @@ 
         <return type-id='type-id-1902'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&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-3110'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-957' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2489'/>
           </member-type>
@@ -19827,7 +19511,6 @@ 
         <return type-id='type-id-2490'/>
       </function-decl>
       <class-decl name='remove_reference&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/type_traits' line='1500' column='1' id='type-id-3111'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2395'/>
           </member-type>
@@ -19837,7 +19520,6 @@ 
         <return type-id='type-id-1626'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::mutex *&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-3112'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-981' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2499'/>
           </member-type>
@@ -19847,7 +19529,6 @@ 
         <return type-id='type-id-2500'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &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-3113'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2297' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2534'/>
           </member-type>
@@ -19857,7 +19538,6 @@ 
         <return type-id='type-id-2301'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;6&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-3114'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2501'/>
           </member-type>
@@ -19867,7 +19547,6 @@ 
         <return type-id='type-id-2502'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::mutex *&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-3115'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2313' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2540'/>
           </member-type>
@@ -19877,7 +19556,6 @@ 
         <return type-id='type-id-2317'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&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-3116'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-497' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2351'/>
           </member-type>
@@ -19890,7 +19568,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;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/type_traits' line='1504' column='1' id='type-id-3117'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-697' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2353'/>
           </member-type>
@@ -19900,7 +19577,6 @@ 
         <return type-id='type-id-698'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::_Placeholder&lt;2&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-3118'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-700' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2355'/>
           </member-type>
@@ -19910,7 +19586,6 @@ 
         <return type-id='type-id-701'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::CallbackArgs &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-3119'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2341'/>
           </member-type>
@@ -19920,13 +19595,11 @@ 
         <return type-id='type-id-409'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::lock_guard&lt;std::mutex&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-3120'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2309' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3121'/>
           </member-type>
       </class-decl>
       <class-decl name='lock_guard&lt;std::mutex&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='371' column='1' id='type-id-1276'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-1279' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='374' column='1' id='type-id-2310'/>
           </member-type>
@@ -20032,7 +19705,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &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-813'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-873'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-569'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-816'/>
           </member-type>
@@ -20121,7 +19793,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &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-873'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-596'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-876'/>
           </member-type>
@@ -20341,7 +20012,6 @@ 
         <return type-id='type-id-3121'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &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-3122'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2258' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3123'/>
           </member-type>
@@ -20359,7 +20029,6 @@ 
         <return type-id='type-id-3121'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::lock_guard&lt;std::mutex&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-3124'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2306' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2536'/>
           </member-type>
@@ -20369,7 +20038,6 @@ 
         <return type-id='type-id-2309'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &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-3125'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2517'/>
           </member-type>
@@ -20379,7 +20047,6 @@ 
         <return type-id='type-id-2259'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &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-3126'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-481' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3127'/>
           </member-type>
@@ -20391,7 +20058,6 @@ 
         <return type-id='type-id-3127'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&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-3128'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-481' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2417'/>
           </member-type>
@@ -20453,7 +20119,6 @@ 
         <return type-id='type-id-3079'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&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-3130'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-493' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2425'/>
           </member-type>
@@ -20463,7 +20128,6 @@ 
         <return type-id='type-id-2426'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3131'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1343' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2556'/>
           </member-type>
@@ -20473,7 +20137,6 @@ 
         <return type-id='type-id-2557'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3132'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-843' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2455'/>
           </member-type>
@@ -20483,7 +20146,6 @@ 
         <return type-id='type-id-2456'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3133'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-915' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2471'/>
           </member-type>
@@ -20493,7 +20155,6 @@ 
         <return type-id='type-id-2472'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3134'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-933' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2479'/>
           </member-type>
@@ -20503,7 +20164,6 @@ 
         <return type-id='type-id-2480'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&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-3135'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-951' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2487'/>
           </member-type>
@@ -20513,7 +20173,6 @@ 
         <return type-id='type-id-2488'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, nullptr_t&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-3136'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-969' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2495'/>
           </member-type>
@@ -20526,7 +20185,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&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-3137'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-494' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2349'/>
           </member-type>
@@ -20536,7 +20194,6 @@ 
         <return type-id='type-id-495'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3138'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-490' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2423'/>
           </member-type>
@@ -20546,7 +20203,6 @@ 
         <return type-id='type-id-2424'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3139'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-374' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2337'/>
           </member-type>
@@ -20564,7 +20220,6 @@ 
         <return type-id='type-id-3079'/>
       </function-decl>
       <class-decl name='__add_ref&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/tuple' line='62' column='1' id='type-id-3140'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3141'/>
           </member-type>
@@ -20582,7 +20237,6 @@ 
         <return type-id='type-id-3085'/>
       </function-decl>
       <class-decl name='__add_ref&lt;unsigned long&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-3142'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3143'/>
           </member-type>
@@ -20592,7 +20246,6 @@ 
         <return type-id='type-id-3143'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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/tuple' line='62' column='1' id='type-id-3144'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2277' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3145'/>
           </member-type>
@@ -20606,7 +20259,6 @@ 
         <return type-id='type-id-3145'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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-3146'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1236' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2526'/>
           </member-type>
@@ -20620,7 +20272,6 @@ 
         <return type-id='type-id-3143'/>
       </function-decl>
       <class-decl name='remove_reference&lt;unsigned long &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-3147'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-51' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2568'/>
           </member-type>
@@ -20638,7 +20289,6 @@ 
         <return type-id='type-id-3081'/>
       </function-decl>
       <class-decl name='__add_ref&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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/tuple' line='66' column='1' id='type-id-3148'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-375' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3149'/>
           </member-type>
@@ -20656,7 +20306,6 @@ 
         <return type-id='type-id-3141'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandRequest &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-3150'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-399' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2384'/>
           </member-type>
@@ -20670,7 +20319,6 @@ 
         <return type-id='type-id-3079'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &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-3151'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2443'/>
           </member-type>
@@ -20680,7 +20328,6 @@ 
         <return type-id='type-id-2444'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3152'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1340' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2554'/>
           </member-type>
@@ -20690,7 +20337,6 @@ 
         <return type-id='type-id-2555'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3153'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-837' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2453'/>
           </member-type>
@@ -20700,7 +20346,6 @@ 
         <return type-id='type-id-2454'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3154'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-909' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2469'/>
           </member-type>
@@ -20710,7 +20355,6 @@ 
         <return type-id='type-id-2470'/>
       </function-decl>
       <class-decl name='remove_reference&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/type_traits' line='1500' column='1' id='type-id-3155'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-399' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2386'/>
           </member-type>
@@ -20720,7 +20364,6 @@ 
         <return type-id='type-id-1615'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const char *&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-3156'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-93' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2333'/>
           </member-type>
@@ -20730,7 +20373,6 @@ 
         <return type-id='type-id-2334'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::SharedBuffer &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-3157'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-362' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2371'/>
           </member-type>
@@ -20740,7 +20382,6 @@ 
         <return type-id='type-id-2372'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3158'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-945' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2483'/>
           </member-type>
@@ -20750,7 +20391,6 @@ 
         <return type-id='type-id-2484'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3159'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2491'/>
           </member-type>
@@ -20760,7 +20400,6 @@ 
         <return type-id='type-id-2492'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&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-3160'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-975' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2497'/>
           </member-type>
@@ -20770,7 +20409,6 @@ 
         <return type-id='type-id-2498'/>
       </function-decl>
       <class-decl name='remove_reference&lt;unsigned long&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-3161'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-51' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2570'/>
           </member-type>
@@ -20780,7 +20418,6 @@ 
         <return type-id='type-id-2715'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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/type_traits' line='1500' column='1' id='type-id-3162'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1236' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2528'/>
           </member-type>
@@ -20805,7 +20442,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, 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/type_traits' line='1504' column='1' id='type-id-3163'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2741' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2586'/>
           </member-type>
@@ -20815,7 +20451,6 @@ 
         <return type-id='type-id-2587'/>
       </function-decl>
       <class-decl name='remove_reference&lt;bool (*&amp;)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&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-3164'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-152' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2331'/>
           </member-type>
@@ -20825,7 +20460,6 @@ 
         <return type-id='type-id-2332'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Any_data &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-3165'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2415'/>
           </member-type>
@@ -20838,7 +20472,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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-3166'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1237' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2365'/>
           </member-type>
@@ -20848,7 +20481,6 @@ 
         <return type-id='type-id-1238'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &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-3167'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-502' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2431'/>
           </member-type>
@@ -20886,7 +20518,6 @@ 
         <return type-id='type-id-3081'/>
       </function-decl>
       <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::CallbackArgs &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-3168'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3169'/>
           </member-type>
@@ -20900,7 +20531,6 @@ 
         <return type-id='type-id-3169'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &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-3170'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2720' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2578'/>
           </member-type>
@@ -20910,7 +20540,6 @@ 
         <return type-id='type-id-2579'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&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-3171'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1358' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2564'/>
           </member-type>
@@ -20920,7 +20549,6 @@ 
         <return type-id='type-id-2565'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&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-3172'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-885' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2461'/>
           </member-type>
@@ -20930,7 +20558,6 @@ 
         <return type-id='type-id-2462'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&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-3173'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-903' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2467'/>
           </member-type>
@@ -20940,7 +20567,6 @@ 
         <return type-id='type-id-2468'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3&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-3174'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2485'/>
           </member-type>
@@ -20950,7 +20576,6 @@ 
         <return type-id='type-id-2486'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &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-3175'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2718' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2572'/>
           </member-type>
@@ -20960,7 +20585,6 @@ 
         <return type-id='type-id-2719'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &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/type_traits' line='1500' column='1' id='type-id-3176'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2435'/>
           </member-type>
@@ -20975,7 +20599,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &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-3177'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2738' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2584'/>
           </member-type>
@@ -20985,7 +20608,6 @@ 
         <return type-id='type-id-2585'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &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-3178'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2433'/>
           </member-type>
@@ -21007,7 +20629,6 @@ 
         <return type-id='type-id-3141'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3179'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1593' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3180'/>
           </member-type>
@@ -21021,7 +20642,6 @@ 
         <return type-id='type-id-3180'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3181'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-373' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2378'/>
           </member-type>
@@ -21043,7 +20663,6 @@ 
         <return type-id='type-id-3081'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3182'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2727' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2580'/>
           </member-type>
@@ -21053,7 +20672,6 @@ 
         <return type-id='type-id-2581'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3183'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1355' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2562'/>
           </member-type>
@@ -21063,7 +20681,6 @@ 
         <return type-id='type-id-2563'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3184'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-879' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2459'/>
           </member-type>
@@ -21073,7 +20690,6 @@ 
         <return type-id='type-id-2460'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3185'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-897' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2465'/>
           </member-type>
@@ -21083,7 +20699,6 @@ 
         <return type-id='type-id-2466'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3186'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-927' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2477'/>
           </member-type>
@@ -21093,7 +20708,6 @@ 
         <return type-id='type-id-2478'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4&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-3187'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2098' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2493'/>
           </member-type>
@@ -21103,7 +20717,6 @@ 
         <return type-id='type-id-2494'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3188'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-373' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2380'/>
           </member-type>
@@ -21113,7 +20726,6 @@ 
         <return type-id='type-id-1594'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&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-3189'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2574'/>
           </member-type>
@@ -21123,7 +20735,6 @@ 
         <return type-id='type-id-2726'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const mongo::executor::RemoteCommandRequest &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-3190'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2339'/>
           </member-type>
@@ -21137,7 +20748,6 @@ 
         <return type-id='type-id-1680'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &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-3191'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-417' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2399'/>
           </member-type>
@@ -21153,7 +20763,6 @@ 
         <return type-id='type-id-1298'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_List_iterator&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-3192'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-667' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2439'/>
           </member-type>
@@ -21163,7 +20772,6 @@ 
         <return type-id='type-id-1881'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&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-3193'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1129' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2357'/>
           </member-type>
@@ -21173,7 +20781,6 @@ 
         <return type-id='type-id-2358'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&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-3194'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1129' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2359'/>
           </member-type>
@@ -21183,7 +20790,6 @@ 
         <return type-id='type-id-1131'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char&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-3195'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1160' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2507'/>
           </member-type>
@@ -21193,7 +20799,6 @@ 
         <return type-id='type-id-2508'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&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/type_traits' line='1504' column='1' id='type-id-3196'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2463'/>
           </member-type>
@@ -21203,7 +20808,6 @@ 
         <return type-id='type-id-2464'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&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-3197'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-499' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2429'/>
           </member-type>
@@ -21213,7 +20817,6 @@ 
         <return type-id='type-id-2430'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackArgs&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-3198'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1622' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3199'/>
           </member-type>
@@ -21227,7 +20830,6 @@ 
         <return type-id='type-id-3199'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs &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-3200'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-407' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2388'/>
           </member-type>
@@ -21237,7 +20839,6 @@ 
         <return type-id='type-id-1622'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &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-3201'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1232' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2524'/>
           </member-type>
@@ -21247,7 +20848,6 @@ 
         <return type-id='type-id-2525'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&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-3202'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1337' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2552'/>
           </member-type>
@@ -21257,7 +20857,6 @@ 
         <return type-id='type-id-2553'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs&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-3203'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-407' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2390'/>
           </member-type>
@@ -21267,7 +20866,6 @@ 
         <return type-id='type-id-1623'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &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-3204'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1233' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2363'/>
           </member-type>
@@ -21277,7 +20875,6 @@ 
         <return type-id='type-id-1234'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&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-3205'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1087' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2505'/>
           </member-type>
@@ -21292,7 +20889,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventState *&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-3206'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2401'/>
           </member-type>
@@ -21317,7 +20913,6 @@ 
         <return type-id='type-id-3207'/>
       </function-decl>
       <class-decl name='__add_c_ref&lt;mongo::executor::NetworkInterface *&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='53' column='1' id='type-id-3208'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-3209'/>
           </member-type>
@@ -21331,11 +20926,9 @@ 
         <return type-id='type-id-3209'/>
       </function-decl>
       <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;, 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/stl_iterator_base_types.h' line='149' column='1' id='type-id-3210'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2961' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-3211'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-2962' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='151' column='1' id='type-id-3212'/>
           </member-type>
@@ -21356,11 +20949,9 @@ 
         <return type-id='type-id-3212'/>
       </function-decl>
       <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;, 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/stl_iterator_base_types.h' line='149' column='1' id='type-id-3213'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2978' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-3214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-2979' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='151' column='1' id='type-id-3215'/>
           </member-type>
@@ -21381,7 +20972,6 @@ 
         <return type-id='type-id-3215'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::repl::StorageInterface *&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-3216'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1688' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3217'/>
           </member-type>
@@ -21391,7 +20981,6 @@ 
         <return type-id='type-id-3217'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::repl::StorageInterface&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-3218'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2253' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3219'/>
           </member-type>
@@ -21409,7 +20998,6 @@ 
         <return type-id='type-id-3217'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::executor::NetworkInterface *&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-3220'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1613' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3221'/>
           </member-type>
@@ -21419,7 +21007,6 @@ 
         <return type-id='type-id-3221'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::executor::NetworkInterface&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-3222'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2250' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3223'/>
           </member-type>
@@ -21437,7 +21024,6 @@ 
         <return type-id='type-id-3221'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&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-3224'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2421'/>
           </member-type>
@@ -21455,7 +21041,6 @@ 
         <return type-id='type-id-3217'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&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-3225'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2411'/>
           </member-type>
@@ -21465,7 +21050,6 @@ 
         <return type-id='type-id-1688'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&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-3226'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2441'/>
           </member-type>
@@ -21475,7 +21059,6 @@ 
         <return type-id='type-id-2442'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::StorageInterface *&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-3227'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1352' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2560'/>
           </member-type>
@@ -21485,7 +21068,6 @@ 
         <return type-id='type-id-2561'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&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-3228'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2413'/>
           </member-type>
@@ -21502,7 +21084,6 @@ 
         <return type-id='type-id-2254'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::NetworkInterface *&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-3229'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1610' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2382'/>
           </member-type>
@@ -21516,7 +21097,6 @@ 
         <return type-id='type-id-2251'/>
       </function-decl>
       <class-decl name='_Bind_helper&lt;false, void (&amp;)(const std::function&lt;void ()&gt; &amp;), const std::function&lt;void ()&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-3230'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-508' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3231'/>
           </member-type>
@@ -21527,7 +21107,6 @@ 
         <return type-id='type-id-3231'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &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-3232'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-508' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2437'/>
           </member-type>
@@ -21537,7 +21116,6 @@ 
         <return type-id='type-id-2438'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::function&lt;void ()&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-3233'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2268' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3234'/>
           </member-type>
@@ -21551,7 +21129,6 @@ 
         <return type-id='type-id-3234'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::function&lt;void ()&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-3235'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1224' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2520'/>
           </member-type>
@@ -21561,7 +21138,6 @@ 
         <return type-id='type-id-2268'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::function&lt;void ()&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-3236'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2745' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2588'/>
           </member-type>
@@ -21571,7 +21147,6 @@ 
         <return type-id='type-id-2589'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;std::function&lt;void ()&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-3237'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1364' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2566'/>
           </member-type>
@@ -21581,7 +21156,6 @@ 
         <return type-id='type-id-2567'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::function&lt;void ()&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-3238'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1224' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2522'/>
           </member-type>
@@ -21596,7 +21170,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &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-3239'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2733' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2582'/>
           </member-type>
@@ -21606,7 +21179,6 @@ 
         <return type-id='type-id-2583'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const std::function&lt;void ()&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-3240'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2743' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2576'/>
           </member-type>
@@ -21616,7 +21188,6 @@ 
         <return type-id='type-id-2744'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::function&lt;void ()&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-3241'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1225' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2361'/>
           </member-type>
@@ -21626,7 +21197,6 @@ 
         <return type-id='type-id-1226'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const mongo::repl::ReplicationExecutor::WorkItem &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-3242'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2347'/>
           </member-type>
@@ -21636,7 +21206,6 @@ 
         <return type-id='type-id-465'/>
       </function-decl>
       <class-decl name='remove_reference&lt;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/type_traits' line='1504' column='1' id='type-id-3243'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-414' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2343'/>
           </member-type>
@@ -21646,7 +21215,6 @@ 
         <return type-id='type-id-415'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&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-3244'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2503'/>
           </member-type>
@@ -21661,7 +21229,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackState *&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-3245'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1630' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2397'/>
           </member-type>
@@ -21671,7 +21238,6 @@ 
         <return type-id='type-id-2398'/>
       </function-decl>
       <class-decl name='remove_reference&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/type_traits' line='1504' column='1' id='type-id-3246'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-422' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2345'/>
           </member-type>
@@ -21681,7 +21247,6 @@ 
         <return type-id='type-id-423'/>
       </function-decl>
       <class-decl name='__add_c_ref&lt;std::basic_ostringstream&lt;char&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='53' column='1' id='type-id-3247'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2235' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-3248'/>
           </member-type>
@@ -21742,7 +21307,6 @@ 
       <class-decl name='_Tuple_impl&lt;0, std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &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-801'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-563'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-867' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-804'/>
           </member-type>
@@ -21823,7 +21387,6 @@ 
       <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &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-867'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-593'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-870'/>
           </member-type>
@@ -22031,7 +21594,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::thread::id &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-3249'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2616' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2548'/>
           </member-type>
@@ -22048,7 +21610,6 @@ 
       <class-decl name='function&lt;mongo::OperationContext *()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1216'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3250'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-1575' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-3251'/>
           </member-type>
@@ -22130,24 +21691,19 @@ 
       </class-decl>
       <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::OperationContext *&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='495' column='1' id='type-id-3250'/>
       <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char&gt;, std::default_delete&lt;std::basic_ostringstream&lt;char&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/unique_ptr.h' line='129' column='1' id='type-id-1396'>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1361' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-3252'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-3254' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-3253'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-3255'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-2233' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-3254'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-1204' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1400'/>
           </member-type>
@@ -22281,19 +21837,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char&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='1967' column='1' id='type-id-3258'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1206' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-3256'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &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-3259'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1204' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2515'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::basic_ostringstream&lt;char&gt;, 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='1516' column='1' id='type-id-3260'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2232' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3257'/>
           </member-type>
@@ -22301,7 +21854,6 @@ 
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3261'/>
       <typedef-decl name='ostream' type-id='type-id-3261' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/iosfwd' line='136' column='1' id='type-id-2318'/>
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-2281'>
-
           <member-type access='private'>
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='533' column='1' id='type-id-2285'>
               <data-member access='private' static='yes'>
@@ -22328,7 +21880,6 @@ 
       <class-decl name='function&lt;void (const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1228'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3262'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-2736' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-3263'/>
           </member-type>
@@ -22416,7 +21967,6 @@ 
       <class-decl name='function&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1220'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3265'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-1533' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-3266'/>
           </member-type>
@@ -22508,24 +22058,19 @@ 
       </class-decl>
       <class-decl name='binary_function&lt;mongo::OperationContext *, const mongo::Status &amp;, mongo::repl::TaskRunner::NextAction&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-3268'/>
       <class-decl name='unique_ptr&lt;std::lock_guard&lt;std::mutex&gt;, std::default_delete&lt;std::lock_guard&lt;std::mutex&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/unique_ptr.h' line='129' column='1' id='type-id-1403'>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1367' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-3269'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-3271' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-3270'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-3272'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-2306' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-3271'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-1208' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1407'/>
           </member-type>
@@ -22659,13 +22204,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, const std::default_delete&lt;std::lock_guard&lt;std::mutex&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='1967' column='1' id='type-id-3275'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1210' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-3273'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::lock_guard&lt;std::mutex&gt;, 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='1516' column='1' id='type-id-3276'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2305' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3274'/>
           </member-type>
@@ -22792,46 +22335,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2760'>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&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='1139' column='1' id='type-id-3281'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3283' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3282'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&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='1139' column='1' id='type-id-3284'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3285'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&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='1139' column='1' id='type-id-3287'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3289' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3288'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&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='1139' column='1' id='type-id-3290'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3292' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3291'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&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='1139' column='1' id='type-id-3293'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3295' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3294'/>
                 </member-type>
@@ -22879,28 +22412,23 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_rvalue_reference_helper&lt;mongo::OperationContext *&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-3297'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1578' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3289'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_rvalue_reference_helper&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &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-3298'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-375' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3292'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::CallbackArgs &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-3299'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3295'/>
           </member-type>
       </class-decl>
       <class-decl name='_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2761'>
-
           <member-type access='private'>
             <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt; (std::_Placeholder&lt;2&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&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='1139' column='1' id='type-id-3300'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-3302' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-3301'/>
                 </member-type>
@@ -22916,7 +22444,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_rvalue_reference_helper&lt;mongo::Status &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-3303'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1588' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3302'/>
           </member-type>
@@ -22974,7 +22501,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&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-3305'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-3306'/>
           </member-type>
@@ -23084,7 +22610,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &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/functional' line='1210' column='1' id='type-id-3311'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-3312'/>
           </member-type>
@@ -23154,15 +22679,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-1141'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-709' 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-3317'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1908' 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-3318'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-3319'/>
           </member-type>
@@ -23195,7 +22717,6 @@ 
       </class-decl>
       <class-decl name='_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-709'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
-
           <member-type access='private'>
             <class-decl name='_Impl' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1909'>
               <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1915'/>
@@ -23278,7 +22799,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='aligned_storage&lt;96, 8&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='1881' column='1' id='type-id-3320'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-3321'>
               <member-type access='private'>
@@ -23295,35 +22815,27 @@ 
       </class-decl>
       <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-140' 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-3323'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-3324'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3317' 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-2223'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-3326' 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-3325'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-3318' 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-3326'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-3328' 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-3327'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-3319' 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-3328'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-3330' 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-3329'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-3331' 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-3330'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1141' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3332'/>
           </member-type>
@@ -23452,23 +22964,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&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/ptr_traits.h' line='150' column='1' id='type-id-3338'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1908' 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-3339'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-712' 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-3333'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-3334'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-3331'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-3335'/>
           </member-type>
@@ -23480,13 +22987,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&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/ptr_traits.h' line='105' column='1' id='type-id-3340'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-709' 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-2175'/>
           </member-type>
       </class-decl>
       <class-decl name='enable_if&lt;true, 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/type_traits' line='1953' column='1' id='type-id-3341'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-53' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-3342'/>
           </member-type>
@@ -23494,31 +22999,24 @@ 
       <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt; &gt;' type-id='type-id-3342' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3336'/>
       <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-3342' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3337'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::repl::ReplicationExecutor::Event&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-3343'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2967' 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-2221'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-3345' 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-3344'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-2968' 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-3345'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-3347' 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-3346'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-2969' 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-3347'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-3349' 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-3348'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-3350' 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-3349'/>
           </member-type>
@@ -23645,23 +23143,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;mongo::repl::ReplicationExecutor::Event *&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-3356'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1677' 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-3357'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-462' 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-3351'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-3352'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-3350'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-3353'/>
           </member-type>
@@ -23673,7 +23166,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor::Event&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-3358'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-459' 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-2173'/>
           </member-type>
@@ -23694,15 +23186,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-1144'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-142'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-713' 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-3360'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1912' 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-3361'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-3362'/>
           </member-type>
@@ -23735,7 +23224,6 @@ 
       </class-decl>
       <class-decl name='_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-713'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
-
           <member-type access='private'>
             <class-decl name='_Impl' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1913'>
               <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1918'/>
@@ -23817,7 +23305,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='aligned_storage&lt;32, 8&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='1881' column='1' id='type-id-3363'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-3364'>
               <member-type access='private'>
@@ -23834,35 +23321,27 @@ 
       </class-decl>
       <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-142' 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-3365'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-3366'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3360' 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-2225'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-3368' 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-3367'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-3361' 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-3368'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-3370' 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-3369'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-3362' 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-3370'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-3372' 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-3371'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-3373' 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-3372'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1144' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3374'/>
           </member-type>
@@ -23989,23 +23468,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&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/ptr_traits.h' line='150' column='1' id='type-id-3380'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1912' 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-3381'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-716' 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-3375'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-3376'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-3373'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-3377'/>
           </member-type>
@@ -24017,7 +23491,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&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/ptr_traits.h' line='105' column='1' id='type-id-3382'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-713' 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-2177'/>
           </member-type>
@@ -24025,31 +23498,24 @@ 
       <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-3342' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3378'/>
       <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-3342' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3379'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &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-3383'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2910' 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-2227'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-3385' 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-3384'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-2911' 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-3385'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-3387' 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-3386'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-2912' 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-3387'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-3389' 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-3388'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-3390' 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-3389'/>
           </member-type>
@@ -24174,23 +23640,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &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/ptr_traits.h' line='150' column='1' id='type-id-3396'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2612' 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-3397'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-1318' 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-3391'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-3392'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-3390'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-3393'/>
           </member-type>
@@ -24202,7 +23663,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &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/ptr_traits.h' line='105' column='1' id='type-id-3398'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1315' 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-2179'/>
           </member-type>
@@ -24262,7 +23722,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&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-3402'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-3403'/>
           </member-type>
@@ -24306,51 +23765,39 @@ 
         </member-function>
       </class-decl>
       <class-decl name='unordered_map&lt;std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *, std::hash&lt;string&gt;, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1410'>
-
           <member-type access='private'>
             <typedef-decl name='_Hashtable' type-id='type-id-3407' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-3406'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-3409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-3408'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='hasher' type-id='type-id-2795' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1417'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_equal' type-id='type-id-527' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1420'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-524' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1414'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-3411' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='121' column='1' id='type-id-3410'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-3413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-3412'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-3414' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='108' column='1' id='type-id-1429'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-530' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='107' column='1' id='type-id-1423'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='mapped_type' type-id='type-id-1059' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1426'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='local_iterator' type-id='type-id-3416' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='123' column='1' id='type-id-3415'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_local_iterator' type-id='type-id-3418' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='124' column='1' id='type-id-3417'/>
           </member-type>
@@ -24744,63 +24191,48 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1070'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1003'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1022'/>
-
           <member-type access='private'>
             <typedef-decl name='__bucket_type' type-id='type-id-2806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1755'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-2790' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='302' column='1' id='type-id-3409'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__node_base' type-id='type-id-2807' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1759'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__hashtable_alloc' type-id='type-id-1022' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1757'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__node_type' type-id='type-id-1015' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='188' column='1' id='type-id-1761'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1150' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-524'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_equal' type-id='type-id-1212' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-527'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-2786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='305' column='1' id='type-id-3411'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-2788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-3413'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-1160' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='202' column='1' id='type-id-530'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='local_iterator' type-id='type-id-2791' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='308' column='1' id='type-id-3416'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_local_iterator' type-id='type-id-2793' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='309' column='1' id='type-id-3418'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__hash_code' type-id='type-id-2780' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-3422'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__rehash_state' type-id='type-id-2808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-521'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1285' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='203' column='1' id='type-id-3414'/>
           </member-type>
@@ -25370,7 +24802,6 @@ 
       </class-decl>
       <class-decl name='__hash_base&lt;unsigned long, std::basic_string&lt;char&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/functional_hash.h' line='50' column='1' id='type-id-3423'/>
       <class-decl name='aligned_storage&lt;16, 8&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='1881' column='1' id='type-id-3424'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-3425'>
               <member-type access='private'>
@@ -25455,14 +24886,12 @@ 
       </class-decl>
       <class-decl name='binary_function&lt;std::basic_string&lt;char&gt;, std::basic_string&lt;char&gt;, bool&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-3427'/>
       <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&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='1962' column='1' id='type-id-3428'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1963' column='1' id='type-id-2784'/>
           </member-type>
       </class-decl>
       <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3419'/>
       <class-decl name='tuple_element&lt;1, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&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/utility' line='97' column='1' id='type-id-3429'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1654' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='98' column='1' id='type-id-2799'/>
           </member-type>
@@ -25470,7 +24899,6 @@ 
       <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2804'/>
       <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &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-1147'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1015' 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-2805'/>
           </member-type>
@@ -25683,15 +25111,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-442'>
-
             <member-type access='private'>
               <typedef-decl name='AppenderVector' type-id='type-id-1432' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-3432'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='Event' type-id='type-id-3433' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-446'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='AppenderAutoPtr' type-id='type-id-2874' filepath='src/mongo/logger/log_domain.h' line='85' column='1' id='type-id-3434'/>
             </member-type>
@@ -25846,7 +25271,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-435'>
-
             <member-type access='private'>
               <enum-decl name='Value' filepath='src/mongo/logger/log_component.h' line='45' column='1' id='type-id-3436'>
                 <underlying-type type-id='type-id-44'/>
@@ -26350,7 +25774,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-449'>
-
             <member-type access='private'>
               <typedef-decl name='DomainsByNameMap' type-id='type-id-1410' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-3438'/>
             </member-type>
@@ -26402,7 +25825,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-369'>
-
           <member-type access='private'>
             <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1591'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -26591,7 +26013,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-302'>
-
           <member-type access='private'>
             <typedef-decl name='WordType' type-id='type-id-18' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-3440'/>
           </member-type>
@@ -26670,7 +26091,6 @@ 
       </class-decl>
       <typedef-decl name='AtomicUInt32' type-id='type-id-302' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-3439'/>
       <class-decl name='ErrorCodes' size-in-bits='8' visibility='default' filepath='build/debug/mongo/base/error_codes.h' line='39' column='1' id='type-id-3441'>
-
           <member-type access='private'>
             <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='41' column='1' id='type-id-336'>
               <underlying-type type-id='type-id-44'/>
@@ -26873,7 +26293,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-387'>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-93' filepath='src/mongo/base/string_data.h' line='157' column='1' id='type-id-3442'/>
           </member-type>
@@ -27023,10 +26442,8 @@ 
         </member-function>
       </class-decl>
       <namespace-decl name='repl'>
-
         <class-decl name='ReplicationExecutor' size-in-bits='7488' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='92' column='1' id='type-id-455'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1620'/>
-
             <member-type access='private'>
               <class-decl name='WorkItem' size-in-bits='448' is-struct='yes' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='364' column='1' id='type-id-463'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -27052,7 +26469,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='Event' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='379' column='1' id='type-id-459'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1635'/>
@@ -27111,15 +26527,12 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='WorkQueue' type-id='type-id-1263' filepath='src/mongo/db/repl/replication_executor.h' line='212' column='1' id='type-id-1681'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='EventList' type-id='type-id-1250' filepath='src/mongo/db/repl/replication_executor.h' line='217' column='1' id='type-id-3444'/>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='Callback' size-in-bits='640' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='327' column='1' id='type-id-1674'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1628'/>
@@ -27479,7 +26892,6 @@ 
         </class-decl>
         <class-decl name='StorageInterface' visibility='default' is-declaration-only='yes' id='type-id-1683'/>
         <class-decl name='TaskRunner' visibility='default' is-declaration-only='yes' id='type-id-3446'>
-
             <member-type access='private'>
               <enum-decl name='NextAction' filepath='src/mongo/db/repl/task_runner.h' line='53' column='1' id='type-id-3267'>
                 <underlying-type type-id='type-id-44'/>
@@ -27493,7 +26905,6 @@ 
       </namespace-decl>
       <namespace-decl name='executor'>
         <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-1620'>
-
             <member-type access='private'>
               <class-decl name='EventHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='318' column='1' id='type-id-417'>
                 <data-member access='private' layout-offset-in-bits='0'>
@@ -27547,7 +26958,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='CallbackHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='267' column='1' id='type-id-413'>
                 <data-member access='private' layout-offset-in-bits='0'>
@@ -27601,7 +27011,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='RemoteCommandCallbackArgs' size-in-bits='1216' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='367' column='1' id='type-id-421'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -27628,7 +27037,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='CallbackArgs' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='352' column='1' id='type-id-407'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -27655,15 +27063,12 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='CallbackFn' type-id='type-id-1232' filepath='src/mongo/executor/task_executor.h' line='90' column='1' id='type-id-410'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='RemoteCommandCallbackFn' type-id='type-id-1236' filepath='src/mongo/executor/task_executor.h' line='101' column='1' id='type-id-424'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='ResponseStatus' type-id='type-id-373' filepath='src/mongo/executor/task_executor.h' line='81' column='1' id='type-id-3448'/>
             </member-type>
@@ -27771,9 +27176,7 @@ 
         <typedef-decl name='thread' type-id='type-id-1311' filepath='src/mongo/stdx/thread.h' line='36' column='1' id='type-id-3445'/>
         <typedef-decl name='condition_variable' type-id='type-id-1193' filepath='src/mongo/stdx/condition_variable.h' line='36' column='1' id='type-id-3443'/>
       </namespace-decl>
-
       <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-362'>
-
           <member-type access='private'>
             <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-366'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -28098,11 +27501,9 @@ 
       </class-decl>
       <typedef-decl name='Milliseconds' type-id='type-id-2776' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-342'/>
       <class-decl name='OldThreadPool' size-in-bits='2432' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='44' column='1' id='type-id-352'>
-
           <member-type access='private'>
             <class-decl name='DoNotStartThreadsTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='49' column='1' id='type-id-355'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='Task' type-id='type-id-1224' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='48' column='1' id='type-id-3449'/>
           </member-type>
@@ -28720,7 +28121,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-332'>
-
           <member-type access='private'>
             <class-decl name='Value' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/platform/decimal128.h' line='82' column='1' id='type-id-3452'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -28731,7 +28131,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <enum-decl name='SignalingFlag' filepath='src/mongo/platform/decimal128.h' line='108' column='1' id='type-id-3453'>
               <underlying-type type-id='type-id-44'/>
@@ -28743,7 +28142,6 @@ 
               <enumerator name='kInexact' value='32'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <enum-decl name='RoundingMode' filepath='src/mongo/platform/decimal128.h' line='87' column='1' id='type-id-3454'>
               <underlying-type type-id='type-id-44'/>
@@ -29655,7 +29053,6 @@ 
         <enumerator name='JS' value='2'/>
       </enum-decl>
       <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-305'>
-
           <member-type access='private'>
             <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-3457'/>
           </member-type>
@@ -30314,11 +29711,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-348'>
-
           <member-type access='private'>
             <typedef-decl name='Timestamp' type-id='type-id-61' filepath='src/mongo/bson/oid.h' line='173' column='1' id='type-id-3459'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='no_initialize_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='207' column='1' id='type-id-3460'/>
           </member-type>
@@ -30521,7 +29916,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-323'>
-
           <member-type access='private'>
             <typedef-decl name='bytes_type' type-id='type-id-93' filepath='src/mongo/base/data_view.h' line='41' column='1' id='type-id-3463'/>
           </member-type>
@@ -30545,7 +29939,6 @@ 
       </class-decl>
       <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-326'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-323'/>
-
           <member-type access='private'>
             <typedef-decl name='bytes_type' type-id='type-id-202' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-3464'/>
           </member-type>
@@ -31444,28 +30837,22 @@ 
       </function-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-3466'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2836'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&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='168' column='1' id='type-id-3467'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2847' 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-2834'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2838' 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-2835'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-127' 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-2826'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2219' 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-126'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-213' 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-2828'/>
           </member-type>
@@ -31514,19 +30901,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&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-130'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1646' 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-3468'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1645' 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-3469'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-1644' 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-3470'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1643' 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-3471'/>
           </member-type>
@@ -31589,19 +30972,15 @@ 
       <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2818'/>
       <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2820'/>
       <class-decl name='new_allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &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-148'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2612' 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-3472'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2611' 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-3473'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-1318' 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-3474'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1317' 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-3475'/>
           </member-type>
@@ -31677,19 +31056,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&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-134'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1680' 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-3476'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1678' 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-3477'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-466' 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-3478'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-465' 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-3479'/>
           </member-type>
@@ -31750,19 +31125,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::EventHandle&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-128'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1634' 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-3480'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1632' 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-3481'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-420' 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-3482'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-419' 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-3483'/>
           </member-type>
@@ -31823,19 +31194,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &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-136'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1887' 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-3484'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1886' 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-3485'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-682' 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-3486'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-681' 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-3487'/>
           </member-type>
@@ -31910,19 +31277,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::Event&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-132'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1677' 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-3488'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1676' 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-3489'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-462' 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-3490'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-461' 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-3491'/>
           </member-type>
@@ -31999,19 +31362,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &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-138'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1889' 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-3492'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1888' 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-3493'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-686' 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-3494'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-685' 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-3495'/>
           </member-type>
@@ -32087,19 +31446,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-140'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1908' 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-3496'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1907' 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-3497'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-712' 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-3498'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-711' 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-3499'/>
           </member-type>
@@ -32207,19 +31562,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &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-142'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1912' 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-3500'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1911' 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-3501'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-716' 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-3502'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-715' 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-3503'/>
           </member-type>
@@ -32356,19 +31707,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &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-144'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2131' 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-3504'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2130' 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-3505'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-1018' 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-3506'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1017' 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-3507'/>
           </member-type>
@@ -32429,19 +31776,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &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-146'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2327' 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-3508'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2325' 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-3509'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-1288' 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-3510'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1287' 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-3511'/>
           </member-type>
@@ -32503,7 +31846,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-
       <namespace-decl name='optional_detail'>
         <function-decl name='prevent_binding_rvalue_ref_to_optional_lvalue_ref&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle &amp;&amp;&gt;' mangled-name='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor14CallbackHandleEOS5_EEvv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor14CallbackHandleEOS5_EEvv'>
           <return type-id='type-id-53'/>
@@ -32513,39 +31855,30 @@ 
         </function-decl>
         <class-decl name='optional_base&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-179'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3512'/>
-
             <member-type access='private'>
               <typedef-decl name='storage_type' type-id='type-id-173' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3513'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='argument_type' type-id='type-id-3515' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3514'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='rval_reference_type' type-id='type-id-3517' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3516'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_const_type' type-id='type-id-3519' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3518'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_type' type-id='type-id-3521' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3520'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_const_type' type-id='type-id-3523' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3522'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type' type-id='type-id-3525' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3524'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='internal_type' type-id='type-id-3526' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-182'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3528' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3527'/>
             </member-type>
@@ -32837,7 +32170,6 @@ 
         </class-decl>
         <class-decl name='optional_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='201' column='1' id='type-id-3512'/>
         <class-decl name='aligned_storage&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-173'>
-
             <member-type access='private'>
               <union-decl name='dummy_u' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3529'>
                 <data-member access='private'>
@@ -32865,31 +32197,24 @@ 
           </member-function>
         </class-decl>
         <class-decl name='types_when_isnt_ref&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3531'>
-
             <member-type access='public'>
               <typedef-decl name='rval_reference_type' type-id='type-id-1618' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3517'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type' type-id='type-id-1617' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3525'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='argument_type' type-id='type-id-405' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3515'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_const_type' type-id='type-id-406' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3519'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_type' type-id='type-id-1619' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3521'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_const_type' type-id='type-id-405' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3523'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1618' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3528'/>
             </member-type>
@@ -32902,39 +32227,30 @@ 
         </class-decl>
         <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-189'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3512'/>
-
             <member-type access='private'>
               <typedef-decl name='storage_type' type-id='type-id-177' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3532'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='argument_type' type-id='type-id-3534' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3533'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='rval_reference_type' type-id='type-id-3536' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3535'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_const_type' type-id='type-id-3538' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3537'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_type' type-id='type-id-3540' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3539'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_const_type' type-id='type-id-3542' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3541'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type' type-id='type-id-3544' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3543'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='internal_type' type-id='type-id-3545' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-192'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3547' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3546'/>
             </member-type>
@@ -33225,7 +32541,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-177'>
-
             <member-type access='private'>
               <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3548'>
                 <data-member access='private'>
@@ -33253,31 +32568,24 @@ 
           </member-function>
         </class-decl>
         <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3549'>
-
             <member-type access='public'>
               <typedef-decl name='rval_reference_type' type-id='type-id-1633' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3536'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type' type-id='type-id-1632' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3544'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='argument_type' type-id='type-id-419' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3534'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_const_type' type-id='type-id-420' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3538'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_type' type-id='type-id-1634' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3540'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_const_type' type-id='type-id-419' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3542'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1633' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3547'/>
             </member-type>
@@ -33290,39 +32598,30 @@ 
         </class-decl>
         <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-184'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3512'/>
-
             <member-type access='private'>
               <typedef-decl name='storage_type' type-id='type-id-175' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3550'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='argument_type' type-id='type-id-3552' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3551'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='rval_reference_type' type-id='type-id-3554' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3553'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_const_type' type-id='type-id-3556' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3555'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer_type' type-id='type-id-3558' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3557'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_const_type' type-id='type-id-3560' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3559'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type' type-id='type-id-3562' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3561'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='internal_type' type-id='type-id-3563' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-187'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3565' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3564'/>
             </member-type>
@@ -33613,7 +32912,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-175'>
-
             <member-type access='private'>
               <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3566'>
                 <data-member access='private'>
@@ -33641,31 +32939,24 @@ 
           </member-function>
         </class-decl>
         <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3567'>
-
             <member-type access='public'>
               <typedef-decl name='rval_reference_type' type-id='type-id-1626' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3554'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type' type-id='type-id-1625' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3562'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='argument_type' type-id='type-id-415' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3552'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_const_type' type-id='type-id-416' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3556'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='pointer_type' type-id='type-id-1627' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3558'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_const_type' type-id='type-id-415' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3560'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1626' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3565'/>
             </member-type>
@@ -33682,19 +32973,16 @@ 
       </namespace-decl>
       <namespace-decl name='detail'>
         <class-decl name='make_reference_content&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3569'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-403' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-3526'/>
             </member-type>
         </class-decl>
         <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3570'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-417' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-3545'/>
             </member-type>
         </class-decl>
         <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3571'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-413' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-3563'/>
             </member-type>
@@ -33702,42 +32990,31 @@ 
       </namespace-decl>
       <namespace-decl name='move_detail'>
         <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/move/detail/meta_utils.hpp' line='45' column='1' id='type-id-3572'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-53' filepath='src/third_party/boost-1.56.0/boost/move/detail/meta_utils.hpp' line='47' column='1' id='type-id-159'/>
             </member-type>
         </class-decl>
       </namespace-decl>
-
-
-
       <class-decl name='optional&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-161'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-179'/>
-
           <member-type access='private'>
             <typedef-decl name='argument_type' type-id='type-id-3514' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3573'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='rval_reference_type' type-id='type-id-3516' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3574'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_const_type' type-id='type-id-3522' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3575'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type' type-id='type-id-3524' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3576'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_const_type' type-id='type-id-3518' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3577'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_type' type-id='type-id-3520' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3578'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3527' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3579'/>
           </member-type>
@@ -33918,38 +33195,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='type_with_alignment&lt;8&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3580'>
-
           <member-type access='private'>
             <typedef-decl name='type' type-id='type-id-3568' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3530'/>
           </member-type>
       </class-decl>
       <class-decl name='optional&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-169'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-189'/>
-
           <member-type access='private'>
             <typedef-decl name='argument_type' type-id='type-id-3533' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3581'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='rval_reference_type' type-id='type-id-3535' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3582'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_const_type' type-id='type-id-3541' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3583'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type' type-id='type-id-3543' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3584'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_const_type' type-id='type-id-3537' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3585'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_type' type-id='type-id-3539' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3586'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3546' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3587'/>
           </member-type>
@@ -34131,31 +33400,24 @@ 
       </class-decl>
       <class-decl name='optional&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-165'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-184'/>
-
           <member-type access='private'>
             <typedef-decl name='argument_type' type-id='type-id-3551' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3588'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='rval_reference_type' type-id='type-id-3553' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3589'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_const_type' type-id='type-id-3559' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3590'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type' type-id='type-id-3561' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3591'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_const_type' type-id='type-id-3555' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3592'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer_type' type-id='type-id-3557' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3593'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3564' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3594'/>
           </member-type>
@@ -34341,7 +33603,6 @@ 
         <return type-id='type-id-1626'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle &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-3595'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-413' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-198'/>
           </member-type>
@@ -34351,7 +33612,6 @@ 
         <return type-id='type-id-199'/>
       </function-decl>
       <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::RemoteCommandResponse&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-3596'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-161' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-194'/>
           </member-type>
@@ -34361,7 +33621,6 @@ 
         <return type-id='type-id-195'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandResponse &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-3597'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-403' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-196'/>
           </member-type>
@@ -34376,7 +33635,6 @@ 
         <return type-id='type-id-1633'/>
       </function-decl>
       <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &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-3598'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-417' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-200'/>
           </member-type>
@@ -34511,7 +33769,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='bool_&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-470'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-248' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
@@ -34622,7 +33879,6 @@ 
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-37'/>
       <return type-id='type-id-85'/>
@@ -36207,7 +35463,6 @@ 
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-106'/>
     </function-decl>
-
     <function-type size-in-bits='64' id='type-id-151'>
       <parameter type-id='type-id-1693'/>
       <parameter type-id='type-id-479'/>
@@ -36288,46 +35543,32 @@ 
     <pointer-type-def type-id='type-id-3603' size-in-bits='64' id='type-id-3604'/>
     <pointer-type-def type-id='type-id-3602' size-in-bits='64' id='type-id-3605'/>
     <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-3606'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3607'/>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-3609' 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-3608'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-399' 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-3610'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-3612' 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-3611'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-3614' 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-3613'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-3616' 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-3615'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-3618' 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-3617'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3620' 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-3619'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-3622' 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-3621'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-3624' 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-3623'/>
           </member-type>
@@ -36810,8 +36051,6 @@ 
         </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-3602'>
@@ -36844,13 +36083,7 @@ 
         </class-decl>
         <typedef-decl name='ResponseStatus' type-id='type-id-3448' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3599'/>
       </namespace-decl>
-
-
-
     </namespace-decl>
-
-
-
     <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-3614'/>
     </namespace-decl>
@@ -37160,13 +36393,7 @@ 
     <qualified-type-def type-id='type-id-3985' volatile='yes' id='type-id-3805'/>
     <qualified-type-def type-id='type-id-3986' volatile='yes' id='type-id-3808'/>
     <namespace-decl name='std'>
-
-
-
-
-
       <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-3987'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3042' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3988'/>
           </member-type>
@@ -37225,39 +36452,30 @@ 
       <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-3990'/>
       <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-3795'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3757'/>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-3768' 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-3799'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-413' 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-3802'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-3641' 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-3991'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-3638' 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-3992'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-3994' 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-3993'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-3996' 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-3995'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3998' 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-3997'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-4000' 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-3999'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-4002' 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-4001'/>
           </member-type>
@@ -37747,7 +36965,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3757'>
-
           <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-3897'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3768'/>
@@ -37789,15 +37006,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-4004' 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-3760'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4005' 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-4002'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-3768' 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-3763'/>
           </member-type>
@@ -37902,67 +37116,52 @@ 
         </member-function>
       </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-4006'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1625' 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-4007'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1627' 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-4008'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-4009'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-413' 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-4010'/>
           </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-4011'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-415' 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-4012'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-416' 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-4013'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-4014'/>
           </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-4015'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-4016' 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-3910'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4018' 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-4017'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-4019' 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-4018'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-4021' 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-4020'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-4022' 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-4021'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-4024' 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-4023'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-4025' 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-4024'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-4027' 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-4026'/>
           </member-type>
@@ -38095,22 +37294,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3768'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3646'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-413' 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-4016'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1627' 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-4019'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-4022'/>
           </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-4033'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-3768' 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-4034'/>
                 </member-type>
@@ -38138,23 +37332,18 @@ 
       </class-decl>
       <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3646' 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-4035'/>
       <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-4036'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1627' 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-4037'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-416' 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-4028'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-19' 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-4029'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-19' 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-4025'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2858' 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-4030'/>
           </member-type>
@@ -38166,13 +37355,11 @@ 
         </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-4038'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-413' 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-3902'/>
           </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-4039'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-4034' 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-4027'/>
           </member-type>
@@ -38247,7 +37434,6 @@ 
       <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-3713'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3725'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-560'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-3725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3716'/>
           </member-type>
@@ -38338,7 +37524,6 @@ 
       <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-3725'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3743'/>
         <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3686'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-3743' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3728'/>
           </member-type>
@@ -38427,7 +37612,6 @@ 
       <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-3743'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2083'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3689'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3746'/>
           </member-type>
@@ -38637,7 +37821,6 @@ 
         <return type-id='type-id-3988'/>
       </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-4040'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3027' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-4041'/>
           </member-type>
@@ -38756,7 +37939,6 @@ 
       <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-3719'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3731'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-560'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-3731' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3722'/>
           </member-type>
@@ -38845,7 +38027,6 @@ 
       <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-3731'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3686'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3734'/>
           </member-type>
@@ -38983,7 +38164,6 @@ 
       <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-3695'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3680'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3698'/>
           </member-type>
@@ -39256,7 +38436,6 @@ 
       <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-3707'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3737'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-554'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-3737' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3710'/>
           </member-type>
@@ -39345,7 +38524,6 @@ 
       <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-3737'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2064'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-584'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3740'/>
           </member-type>
@@ -39476,7 +38654,6 @@ 
       <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-3701'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2041'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3683'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-2041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3704'/>
           </member-type>
@@ -39612,7 +38789,6 @@ 
         <return type-id='type-id-3675'/>
       </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-4049'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-4050'/>
           </member-type>
@@ -39623,7 +38799,6 @@ 
         <return type-id='type-id-4050'/>
       </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-4051'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3925'/>
           </member-type>
@@ -39633,7 +38808,6 @@ 
         <return type-id='type-id-3926'/>
       </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-4052'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3692' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3931'/>
           </member-type>
@@ -39643,7 +38817,6 @@ 
         <return type-id='type-id-3932'/>
       </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-4053'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3783' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3941'/>
           </member-type>
@@ -39653,7 +38826,6 @@ 
         <return type-id='type-id-3942'/>
       </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-4054'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3737' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3937'/>
           </member-type>
@@ -39679,7 +38851,6 @@ 
         <return type-id='type-id-3081'/>
       </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-4055'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4056'/>
           </member-type>
@@ -39726,23 +38897,18 @@ 
         <return type-id='type-id-1627'/>
       </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-3773'>
-
           <member-type access='private'>
             <typedef-decl name='iterator_type' type-id='type-id-1627' 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-4057'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3916' 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-4058'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-4010' 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-3915'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1627' 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-4059'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-4009' 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-4060'/>
           </member-type>
@@ -39881,22 +39047,17 @@ 
       </function-decl>
       <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3609'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3644'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-399' 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-4061'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1616' 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-4062'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-57' 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-4063'/>
           </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-4064'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-3609' 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-4065'/>
                 </member-type>
@@ -39943,7 +39104,6 @@ 
         <return type-id='type-id-1616'/>
       </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-4067'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3027' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3927'/>
           </member-type>
@@ -39961,7 +39121,6 @@ 
         <return type-id='type-id-3081'/>
       </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-4068'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3826' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4069'/>
           </member-type>
@@ -39975,7 +39134,6 @@ 
         <return type-id='type-id-4069'/>
       </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-4070'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3823' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3921'/>
           </member-type>
@@ -39989,7 +39147,6 @@ 
         <return type-id='type-id-3081'/>
       </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-4071'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-423' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4072'/>
           </member-type>
@@ -40003,7 +39160,6 @@ 
         <return type-id='type-id-4072'/>
       </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-4073'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3980' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3951'/>
           </member-type>
@@ -40013,7 +39169,6 @@ 
         <return type-id='type-id-3952'/>
       </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-4074'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3789' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3945'/>
           </member-type>
@@ -40023,7 +39178,6 @@ 
         <return type-id='type-id-3946'/>
       </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-4075'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3731' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3935'/>
           </member-type>
@@ -40033,7 +39187,6 @@ 
         <return type-id='type-id-3936'/>
       </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-4076'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3823' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-3923'/>
           </member-type>
@@ -40043,7 +39196,6 @@ 
         <return type-id='type-id-3827'/>
       </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-4077'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3980' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-3953'/>
           </member-type>
@@ -40053,7 +39205,6 @@ 
         <return type-id='type-id-3984'/>
       </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-4078'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3042' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3929'/>
           </member-type>
@@ -40071,7 +39222,6 @@ 
         <return type-id='type-id-4069'/>
       </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-4079'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4080'/>
           </member-type>
@@ -40085,7 +39235,6 @@ 
         <return type-id='type-id-4080'/>
       </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-4081'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3917'/>
           </member-type>
@@ -40103,7 +39252,6 @@ 
         <return type-id='type-id-3081'/>
       </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-4082'>
-
           <member-type access='public'>
             <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-3949'/>
           </member-type>
@@ -40113,7 +39261,6 @@ 
         <return type-id='type-id-3950'/>
       </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-4083'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3943'/>
           </member-type>
@@ -40123,7 +39270,6 @@ 
         <return type-id='type-id-3944'/>
       </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-4084'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3933'/>
           </member-type>
@@ -40133,7 +39279,6 @@ 
         <return type-id='type-id-3934'/>
       </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-4085'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3743' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3939'/>
           </member-type>
@@ -40143,7 +39288,6 @@ 
         <return type-id='type-id-3940'/>
       </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-4086'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-3919'/>
           </member-type>
@@ -40153,7 +39297,6 @@ 
         <return type-id='type-id-3819'/>
       </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-4087'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3972' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3947'/>
           </member-type>
@@ -40163,7 +39306,6 @@ 
         <return type-id='type-id-3973'/>
       </function-decl>
       <class-decl name='_Vector_base&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3607'>
-
           <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-3890'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3609'/>
@@ -40205,15 +39347,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-4088' 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-3751'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4089' 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-3624'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-3609' 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-3754'/>
           </member-type>
@@ -40318,35 +39457,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-4090'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-4061' 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-3908'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4092' 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-4091'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__pointer' type-id='type-id-4062' 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-4092'/>
           </member-type>
-
           <member-type access='public'>
             <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-4093'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__size_type' type-id='type-id-4063' 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='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-4095'/>
           </member-type>
-
           <member-type access='public'>
             <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='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' 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='197' column='1' id='type-id-4098'/>
           </member-type>
@@ -40441,23 +39572,18 @@ 
         </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-4103'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1616' 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-402' 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-19' 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-19' 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-2858' 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>
@@ -40469,23 +39595,19 @@ 
         </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-4105'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-399' 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-3900'/>
           </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-4106'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-4065' 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-4099'/>
           </member-type>
       </class-decl>
       <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3630'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-402' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-4107'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-402' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-4108'/>
           </member-type>
@@ -40531,19 +39653,16 @@ 
       <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-3616'/>
       <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-3618'/>
       <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-4109'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3283'/>
           </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-4110'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-423' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-3286'/>
           </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-4111'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3692' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-4112'/>
           </member-type>
@@ -40657,7 +39776,6 @@ 
       </class-decl>
     </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-3672'>
           <data-member access='private' layout-offset-in-bits='0'>
@@ -40743,8 +39861,6 @@ 
           </member-function>
         </class-decl>
       </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-3811'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3666'/>
         <data-member access='protected' layout-offset-in-bits='64'>
@@ -40837,15 +39953,12 @@ 
     </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-3641'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-4007' 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-4119'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-4008' 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-4120'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-4009' 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-4121'/>
           </member-type>
@@ -40951,15 +40064,12 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3638'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-4012' 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-4122'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-4013' 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-4123'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-4014' 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-4124'/>
           </member-type>
@@ -41066,28 +40176,22 @@ 
       </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-4125'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-4015'/>
-
           <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-4126'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-4026' 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-4004'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4017' 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-4005'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-3637' 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-3998'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3910' 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-3636'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-3653' 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-4000'/>
           </member-type>
@@ -41136,19 +40240,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3646'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1627' 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-4127'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-4128'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-416' 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-4129'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-415' 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-4130'/>
           </member-type>
@@ -41224,19 +40324,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3644'>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1616' 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-4131'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1614' 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-4132'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-402' 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-4133'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-401' 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-4134'/>
           </member-type>
@@ -41298,28 +40394,22 @@ 
       </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-4135'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-4090'/>
-
           <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-4136'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-4098' 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-4088'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4091' 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-4089'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-3635' 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-3620'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3634'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-3651' 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-3622'/>
           </member-type>
@@ -41371,15 +40461,7 @@ 
       <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-3614'/>
     </namespace-decl>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
       <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-4137'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-169' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3648'/>
           </member-type>
@@ -41389,9 +40471,6 @@ 
         <return type-id='type-id-3649'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <function-type size-in-bits='64' id='type-id-3972'>
       <parameter type-id='type-id-409'/>
       <parameter type-id='type-id-3823'/>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index 9e653373..70fddaed 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -452,10 +452,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-connection.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='320' id='type-id-34'>
       <subrange length='10' type-id='type-id-27' id='type-id-35'/>
-
     </array-type-def>
     <class-decl name='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
     <class-decl name='DBusCondVar' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
@@ -1628,15 +1626,11 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-server.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
-
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-152'>
       <subrange length='16' type-id='type-id-27' id='type-id-153'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-154'>
       <subrange length='4' type-id='type-id-27' id='type-id-155'/>
-
     </array-type-def>
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-156'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 640ec1b3..3165ec95 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -68,15 +68,11 @@ 
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
       <subrange length='160' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
     </array-type-def>
     <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
@@ -535,7 +531,6 @@ 
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-18'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
     <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-
         <member-type access='private'>
           <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
             <underlying-type type-id='type-id-38'/>
@@ -1810,10 +1805,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-40'>
@@ -2313,37 +2306,27 @@ 
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-46'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-60' size-in-bits='64' id='type-id-50'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-89'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-90'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='5120' id='type-id-52'>
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='204800' id='type-id-53'>
       <subrange length='6400' type-id='type-id-3' id='type-id-92'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-93' size-in-bits='192' id='type-id-49'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -2797,11 +2780,9 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <type-decl name='char' size-in-bits='8' id='type-id-106'/>
     <array-type-def dimensions='1' type-id='type-id-107' size-in-bits='2048' id='type-id-108'>
       <subrange length='32' type-id='type-id-3' id='type-id-109'/>
-
     </array-type-def>
     <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-110'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
@@ -3026,7 +3007,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-68'>
-
         <member-type access='protected'>
           <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
             <underlying-type type-id='type-id-38'/>
@@ -3222,19 +3202,13 @@ 
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-131'>
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='infinite' id='type-id-132'>
       <subrange length='infinite' id='type-id-133'/>
-
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
     </array-type-def>
     <class-decl name='Curvelist' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/curvelist.h' line='47' column='1' id='type-id-135'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -3956,7 +3930,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-66'>
-
         <member-type access='private'>
           <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
             <underlying-type type-id='type-id-38'/>
@@ -5256,9 +5229,7 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-191'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -5863,33 +5834,24 @@ 
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-209'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-216' size-in-bits='640' id='type-id-164'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-217'>
       <subrange length='120' type-id='type-id-3' id='type-id-218'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-219'>
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-221'>
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-224'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -6657,7 +6619,6 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-138'/>
   </abi-instr>
@@ -6761,7 +6722,6 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-243'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-210'/>
-
         <member-type access='private'>
           <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-244'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -6930,7 +6890,6 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-193' size-in-bits='128' id='type-id-249'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-183'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-210'/>
@@ -7112,7 +7071,6 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-253' size-in-bits='64' id='type-id-254'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
     <typedef-decl name='Int' type-id='type-id-10' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-255'/>
@@ -7591,7 +7549,6 @@ 
     </class-decl>
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-272'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-273'>
             <data-member access='private'>
@@ -7685,20 +7642,15 @@ 
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-141'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-276' size-in-bits='640' id='type-id-277'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='92160' id='type-id-278'>
       <subrange length='2880' type-id='type-id-3' id='type-id-279'/>
-
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='320' id='type-id-280'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <class-decl name='Pspec' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/patch.h' line='46' column='1' id='type-id-281'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -7866,7 +7818,6 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-281' size-in-bits='512' id='type-id-180'>
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-181'/>
   </abi-instr>
@@ -8564,14 +8515,11 @@ 
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-300'>
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -9328,34 +9276,24 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='25600' id='type-id-319'>
       <subrange length='100' type-id='type-id-3' id='type-id-320'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-321' size-in-bits='192' id='type-id-322'>
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1600' id='type-id-324'>
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
-
     </array-type-def>
     <type-decl name='float' size-in-bits='32' id='type-id-30'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-12'/>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-328'>
       <subrange length='16' type-id='type-id-3' id='type-id-329'/>
-
     </array-type-def>
     <typedef-decl name='GLUtesselator' type-id='type-id-330' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-331'/>
     <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-330'>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 6dc28371..a90671de 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1525,8 +1525,6 @@ 
     <elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
-
     <function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
@@ -1535,7 +1533,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3'/>
@@ -1833,15 +1830,11 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
-
-
     <array-type-def dimensions='1' type-id='type-id-36' size-in-bits='8448' id='type-id-37'>
       <subrange length='33' type-id='type-id-38' id='type-id-39'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='11904' id='type-id-41'>
       <subrange length='62' type-id='type-id-38' id='type-id-42'/>
-
     </array-type-def>
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='453' column='1' id='type-id-43'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -2296,7 +2289,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-76'/>
@@ -2363,14 +2355,11 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='768' id='type-id-85'>
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='32768' id='type-id-88'>
       <subrange length='4096' type-id='type-id-38' id='type-id-89'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-91'/>
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-93'/>
@@ -2459,7 +2448,6 @@ 
         <return type-id='type-id-26'/>
       </function-decl>
       <class-decl name='StackTrace' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='31' column='1' id='type-id-94'>
-
           <member-type access='public'>
             <typedef-decl name='SymbolizeCallback' type-id='type-id-99' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='33' column='1' id='type-id-113'/>
           </member-type>
@@ -2574,7 +2562,6 @@ 
         <return type-id='type-id-26'/>
       </function-decl>
       <class-decl name='LoadedModule' size-in-bits='960' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='442' column='1' id='type-id-92'>
-
           <member-type access='private'>
             <class-decl name='AddressRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='452' column='1' id='type-id-84'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -3012,12 +2999,10 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='2048' id='type-id-138'>
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <class-decl name='sigaltstack' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/bits/sigstack.h' line='50' column='1' id='type-id-140'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3049,7 +3034,6 @@ 
     </class-decl>
     <typedef-decl name='Elf64_Dyn' type-id='type-id-145' filepath='/usr/include/elf.h' line='650' column='1' id='type-id-146'/>
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-146' visibility='default' filepath='/usr/include/elf.h' line='643' column='1' id='type-id-145'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/elf.h' line='646' column='1' id='type-id-147'>
             <data-member access='private'>
@@ -3214,7 +3198,6 @@ 
         <return type-id='type-id-83'/>
       </function-decl>
       <class-decl name='__sanitizer_kernel_sigaction_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='423' column='1' id='type-id-155'>
-
           <member-type access='public'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='424' column='1' id='type-id-177'>
               <data-member access='private'>
@@ -3524,10 +3507,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='448' id='type-id-184'>
       <subrange length='56' type-id='type-id-38' id='type-id-185'/>
-
     </array-type-def>
     <typedef-decl name='_Unwind_Reason_Code' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='76' column='1' id='type-id-187'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='19_Unwind_Reason_Code' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='66' column='1' id='type-id-186'>
@@ -4330,10 +4311,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='64' id='type-id-211'>
       <subrange length='1' type-id='type-id-38' id='type-id-212'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
     <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
@@ -4358,7 +4337,6 @@ 
         <return type-id='type-id-175'/>
       </function-decl>
       <class-decl name='StackDepotReverseMap' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='39' column='1' id='type-id-215'>
-
           <member-type access='private'>
             <class-decl name='IdDescPair' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='45' column='1' id='type-id-217'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -4575,10 +4553,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <typedef-decl name='pid_t' type-id='type-id-234' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-235'/>
@@ -4738,7 +4714,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <typedef-decl name='demangle_callbackref' type-id='type-id-252' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-73'/>
@@ -4751,7 +4726,6 @@ 
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-252'/>
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-253'/>
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-255'/>
-
     <function-type size-in-bits='64' id='type-id-258'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-23'/>
@@ -4783,12 +4757,10 @@ 
     <class-decl name='backtrace_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-256'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='131072' id='type-id-262'>
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
@@ -5003,7 +4975,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='InternalSymbolizer' size-in-bits='131072' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='321' column='1' id='type-id-266'>
-
           <member-type access='public'>
             <typedef-decl name='SanitizerSymbolizeFn' type-id='type-id-276' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='323' column='1' id='type-id-282'/>
           </member-type>
@@ -5119,15 +5090,12 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <type-decl name='int' size-in-bits='32' id='type-id-5'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-136'/>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1048576' id='type-id-283'>
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-38'/>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-46'/>
@@ -5441,7 +5409,6 @@ 
         <return type-id='type-id-304'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
@@ -5495,34 +5462,22 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-310' size-in-bits='16384' id='type-id-311'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-313' size-in-bits='32768' id='type-id-314'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-315' size-in-bits='552960' id='type-id-316'>
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1024' id='type-id-318'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='112' id='type-id-319'>
       <subrange length='14' type-id='type-id-38' id='type-id-320'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-321'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -5542,41 +5497,32 @@ 
     <type-decl name='float' size-in-bits='32' id='type-id-323'/>
     <array-type-def dimensions='1' type-id='type-id-324' size-in-bits='64000' id='type-id-325'>
       <subrange length='500' type-id='type-id-38' id='type-id-326'/>
-
     </array-type-def>
     <type-decl name='long double' size-in-bits='128' id='type-id-327'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-328'/>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='7552' id='type-id-329'>
       <subrange length='118' type-id='type-id-38' id='type-id-330'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1024' id='type-id-331'>
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='48' id='type-id-333'>
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-334'>
       <subrange length='8' type-id='type-id-38' id='type-id-335'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='1024' id='type-id-336'>
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='256' id='type-id-337'>
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-108' size-in-bits='8192' id='type-id-339'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-340'/>
     <class-decl name='ioctl_desc' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='13' column='1' id='type-id-324'>
-
         <member-type access='public'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='16' column='1' id='type-id-341'>
             <underlying-type type-id='type-id-46'/>
@@ -5658,7 +5604,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-353'>
-
         <member-type access='public'>
           <typedef-decl name='atexit_t' type-id='type-id-108' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='288' column='1' id='type-id-354'/>
         </member-type>
@@ -5810,7 +5755,6 @@ 
     <typedef-decl name='OFF64_T' type-id='type-id-379' filepath='../../.././libsanitizer/interception/interception.h' line='29' column='1' id='type-id-380'/>
     <typedef-decl name='OFF_T' type-id='type-id-171' filepath='../../.././libsanitizer/interception/interception.h' line='28' column='1' id='type-id-381'/>
     <class-decl name='sigaction_t' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='91' column='1' id='type-id-382'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='92' column='1' id='type-id-383'>
             <data-member access='private'>
@@ -6448,7 +6392,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-958'>
-
           <member-type access='public'>
             <typedef-decl name='Type' type-id='type-id-170' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-175'/>
           </member-type>
@@ -6810,7 +6753,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-891'>
-
           <member-type access='private'>
             <class-decl name='Lib' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='43' column='1' id='type-id-313'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -6827,7 +6769,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='LibCodeRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='50' column='1' id='type-id-310'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -14795,7 +14736,6 @@ 
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='1024' id='type-id-1223'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
     <reference-type-def kind='lvalue' type-id='type-id-1226' size-in-bits='64' id='type-id-1227'/>
@@ -15233,97 +15173,65 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='__int128' size-in-bits='128' id='type-id-1238'/>
     <array-type-def dimensions='1' type-id='type-id-1239' size-in-bits='27136' id='type-id-1240'>
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1242' size-in-bits='440960' id='type-id-1243'>
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1244' size-in-bits='875136' id='type-id-1245'>
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1246' size-in-bits='256' id='type-id-1247'>
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1200' size-in-bits='131072' id='type-id-1248'>
       <subrange length='2048' type-id='type-id-38' id='type-id-1249'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1250' size-in-bits='256' id='type-id-1251'>
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1253' size-in-bits='3072' id='type-id-1254'>
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1255' size-in-bits='516608' id='type-id-1256'>
       <subrange length='1009' type-id='type-id-38' id='type-id-1257'/>
-
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-116'/>
     <type-decl name='char' size-in-bits='8' id='type-id-87'/>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='256' id='type-id-1258'>
       <subrange length='32' type-id='type-id-38' id='type-id-1259'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='384' id='type-id-1260'>
       <subrange length='48' type-id='type-id-38' id='type-id-1261'/>
-
     </array-type-def>
     <type-decl name='long int' size-in-bits='64' id='type-id-33'/>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='704' id='type-id-1262'>
       <subrange length='11' type-id='type-id-38' id='type-id-1263'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1472' id='type-id-1264'>
       <subrange length='23' type-id='type-id-38' id='type-id-1265'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='128' id='type-id-1266'>
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='28032' id='type-id-1267'>
       <subrange length='438' type-id='type-id-38' id='type-id-1268'/>
-
     </array-type-def>
     <type-decl name='short int' size-in-bits='16' id='type-id-62'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-129' size-in-bits='512' id='type-id-1269'>
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='640' id='type-id-1270'>
       <subrange length='10' type-id='type-id-38' id='type-id-1271'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-356'>
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-1272'>
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <enum-decl name='LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='283' column='1' id='type-id-1201'>
       <underlying-type type-id='type-id-46'/>
@@ -15532,7 +15440,6 @@ 
       </function-decl>
       <typedef-decl name='u32' type-id='type-id-129' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-170'/>
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1319'>
-
           <member-type access='public'>
             <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1244'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -15546,7 +15453,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1472'/>
           </member-type>
@@ -15662,7 +15568,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='atomic_uint64_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='43' column='1' id='type-id-1246'>
-
           <member-type access='public'>
             <typedef-decl name='Type' type-id='type-id-173' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='44' column='1' id='type-id-304'/>
           </member-type>
@@ -15776,7 +15681,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='atomic_uint8_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='28' column='1' id='type-id-1474'>
-
           <member-type access='public'>
             <typedef-decl name='Type' type-id='type-id-1338' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='29' column='1' id='type-id-1463'/>
           </member-type>
@@ -15786,7 +15690,6 @@ 
       </class-decl>
       <typedef-decl name='u8' type-id='type-id-17' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='66' column='1' id='type-id-1338'/>
       <class-decl name='SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='305' column='1' id='type-id-1309'>
-
           <member-type access='private'>
             <class-decl name='RegionInfo' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='474' column='1' id='type-id-1315'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -15815,11 +15718,9 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1313'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='AllocatorCache' type-id='type-id-1319' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='310' column='1' id='type-id-1311'/>
           </member-type>
@@ -16093,7 +15994,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1476'>
-
           <member-type access='public'>
             <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1321'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16177,11 +16077,9 @@ 
       </class-decl>
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-1461' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-1475'/>
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1317'>
-
           <member-type access='public'>
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1477'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1242'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16267,7 +16165,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='158272' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='677' column='1' id='type-id-1302'>
-
           <member-type access='private'>
             <class-decl name='SizeClassInfo' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='820' column='1' id='type-id-1239'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16281,11 +16178,9 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='679' column='1' id='type-id-1306'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='AllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='682' column='1' id='type-id-1304'/>
           </member-type>
@@ -16552,7 +16447,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1478'>
-
           <member-type access='public'>
             <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1323'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16702,7 +16596,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='atomic_uintptr_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='48' column='1' id='type-id-1200'>
-
           <member-type access='public'>
             <typedef-decl name='Type' type-id='type-id-83' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='49' column='1' id='type-id-1465'/>
           </member-type>
@@ -16712,11 +16605,9 @@ 
       </class-decl>
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-1480'/>
       <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-1333'>
-
           <member-type access='public'>
             <typedef-decl name='ThreadCallback' type-id='type-id-1459' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-1481'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='FindThreadCallback' type-id='type-id-1384' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='99' column='1' id='type-id-1482'/>
           </member-type>
@@ -17615,7 +17506,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='MutexSet' size-in-bits='3136' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='19' column='1' id='type-id-1355'>
-
           <member-type access='public'>
             <class-decl name='Desc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='24' column='1' id='type-id-1253'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -18010,7 +17900,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-1364'>
-
           <member-type access='private'>
             <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-1255'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -19617,7 +19506,6 @@ 
     <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1492'/>
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
-
     <namespace-decl name='__tsan'>
       <class-decl name='ScopedJavaFunc' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='74' column='1' id='type-id-1495'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -19736,11 +19624,9 @@ 
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_md5.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-1497'>
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-1500'/>
-
     <namespace-decl name='__tsan'>
       <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_md5.cc' line='33' column='1' id='type-id-1498'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -19797,22 +19683,17 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-1503' size-in-bits='16777216' id='type-id-1504'>
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1506' size-in-bits='16777216' id='type-id-1507'>
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4096' id='type-id-1508'>
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-1479'>
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
     <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
@@ -20026,7 +19907,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='LargeMmapAllocator&lt;__sanitizer::CrashOnMapUnmap&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1517'>
-
           <member-type access='private'>
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1538'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -20046,7 +19926,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1519'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -20378,7 +20257,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='LargeMmapAllocator&lt;__tsan::MapUnmapCallback&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1520'>
-
           <member-type access='private'>
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1540'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -20398,7 +20276,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1522'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -20761,8 +20638,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <class-decl name='rlimit' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='135' column='1' id='type-id-204'>
@@ -22257,10 +22132,8 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='3448832' id='type-id-1655'>
       <subrange length='431104' type-id='type-id-38' id='type-id-1656'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
     <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
@@ -22729,7 +22602,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <namespace-decl name='__tsan'>
       <function-decl name='ReleaseStoreImpl' filepath='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-348'/>
@@ -22961,23 +22833,17 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-1693' size-in-bits='5062656' id='type-id-1694'>
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='512' id='type-id-1483'>
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='16384' id='type-id-114'>
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4194304' id='type-id-1695'>
       <subrange length='65536' type-id='type-id-38' id='type-id-1696'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
     <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
@@ -23743,8 +23609,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-895' const='yes' id='type-id-1729'/>
@@ -23944,7 +23808,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Symbolizer' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='64' column='1' id='type-id-277'>
-
           <member-type access='protected'>
             <class-decl name='SymbolizerScope' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='133' column='1' id='type-id-273'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -23980,11 +23843,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='StartSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-1739'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='EndSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-1740'/>
           </member-type>
@@ -24411,7 +24272,6 @@ 
         <return type-id='type-id-1368'/>
       </function-decl>
       <class-decl name='MBlock' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='52' column='1' id='type-id-1758'>
-
           <member-type access='public'>
             <typedef-decl name='ScopedLock' type-id='type-id-1754' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='119' column='1' id='type-id-1767'/>
           </member-type>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 8706ed60..f3aed1da 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1616,26 +1616,17 @@ 
     <elf-symbol name='__offload_myo_vtable_tables' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/cean_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32768' id='type-id-3'>
       <subrange length='1024' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='128' id='type-id-7'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='8160' id='type-id-10'>
       <subrange length='255' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <typedef-decl name='COIRESULT' type-id='type-id-12' filepath='../../../gcc/liboffloadmic/include/coi/source/../common/COIResult_common.h' line='122' column='1' id='type-id-13'/>
     <enum-decl name='COIRESULT' filepath='../../../gcc/liboffloadmic/include/coi/source/../common/COIResult_common.h' line='57' column='1' id='type-id-12'>
@@ -1907,9 +1898,6 @@ 
       <var-decl name='EventRegisterCallback' type-id='type-id-108' mangled-name='_ZN3COI21EventRegisterCallbackE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='166' column='1' elf-symbol-id='_ZN3COI21EventRegisterCallbackE'/>
       <var-decl name='ProcessConfigureDMA' type-id='type-id-138' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
     </namespace-decl>
-
-
-
     <function-type size-in-bits='64' id='type-id-85'>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-13'/>
@@ -2180,75 +2168,52 @@ 
     <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-155' size-in-bits='128' id='type-id-156'>
       <subrange length='1' type-id='type-id-4' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-158' size-in-bits='320' id='type-id-159'>
       <subrange length='1' type-id='type-id-4' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='2560' id='type-id-161'>
       <subrange length='20' type-id='type-id-4' id='type-id-162'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-163' size-in-bits='1152' id='type-id-164'>
       <subrange length='9' type-id='type-id-4' id='type-id-165'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='infinite' id='type-id-167'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-168'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='448' id='type-id-169'>
       <subrange length='7' type-id='type-id-4' id='type-id-170'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='2048' id='type-id-171'>
       <subrange length='32' type-id='type-id-4' id='type-id-172'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='448' id='type-id-173'>
       <subrange length='7' type-id='type-id-4' id='type-id-170'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='832' id='type-id-174'>
       <subrange length='104' type-id='type-id-4' id='type-id-175'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-176'>
       <subrange length='16' type-id='type-id-4' id='type-id-177'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='192' id='type-id-178'>
       <subrange length='24' type-id='type-id-4' id='type-id-179'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='320' id='type-id-180'>
       <subrange length='40' type-id='type-id-4' id='type-id-181'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-182'>
       <subrange length='8' type-id='type-id-4' id='type-id-183'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='1024' id='type-id-184'>
       <subrange length='16' type-id='type-id-4' id='type-id-177'/>
-
     </array-type-def>
     <class-decl name='Engine' size-in-bits='5504' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='395' column='1' id='type-id-185'>
-
         <member-type access='private'>
           <typedef-decl name='SignalMap' type-id='type-id-187' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='608' column='1' id='type-id-186'/>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='647' column='1' id='type-id-188'>
             <underlying-type type-id='type-id-14'/>
@@ -2892,7 +2857,6 @@ 
     <typedef-decl name='StreamMap' type-id='type-id-231' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='392' column='1' id='type-id-194'/>
     <typedef-decl name='_Offload_stream' type-id='type-id-56' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='96' column='1' id='type-id-202'/>
     <class-decl name='OffloadDescriptor' size-in-bits='2368' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='68' column='1' id='type-id-232'>
-
         <member-type access='public'>
           <enum-decl name='OmpAsyncLastEventType' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='71' column='1' id='type-id-233'>
             <underlying-type type-id='type-id-14'/>
@@ -2902,7 +2866,6 @@ 
             <enumerator name='c_last_runfunc' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='VarExtra' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='216' column='1' id='type-id-234'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2940,7 +2903,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='ReadArrElements&lt;void*&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-236'>
             <data-member access='private' layout-offset-in-bits='0'>
@@ -2991,7 +2953,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='ReadArrElements&lt;long int&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-238'>
             <data-member access='private' layout-offset-in-bits='0'>
@@ -3042,7 +3003,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='BufferList' type-id='type-id-241' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='213' column='1' id='type-id-240'/>
         </member-type>
@@ -3488,7 +3448,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='Stream' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='326' column='1' id='type-id-262'>
-
         <member-type access='public'>
           <typedef-decl name='StreamMap' type-id='type-id-231' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='371' column='1' id='type-id-263'/>
         </member-type>
@@ -3611,7 +3570,6 @@ 
     <typedef-decl name='__pid_t' type-id='type-id-25' filepath='/usr/include/bits/types.h' line='133' column='1' id='type-id-266'/>
     <typedef-decl name='AutoSet' type-id='type-id-267' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='259' column='1' id='type-id-268'/>
     <class-decl name='PtrDataTable' size-in-bits='704' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='163' column='1' id='type-id-193'>
-
         <member-type access='private'>
           <typedef-decl name='PtrSet' type-id='type-id-270' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='165' column='1' id='type-id-269'/>
         </member-type>
@@ -3716,7 +3674,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='OffloadHostTimerData' size-in-bits='4160' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='51' column='1' id='type-id-276'>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='57' column='1' id='type-id-160'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -3756,7 +3713,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='VarDesc' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='254' column='1' id='type-id-278'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='256' column='1' id='type-id-279'>
             <member-type access='private'>
@@ -3777,7 +3733,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__1' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='265' column='1' id='type-id-281'>
             <member-type access='private'>
@@ -3798,7 +3753,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='287' column='1' id='type-id-283'>
             <data-member access='private'>
@@ -3809,7 +3763,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='298' column='1' id='type-id-284'>
             <data-member access='private'>
@@ -3969,7 +3922,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='OffloadTargetTimerData' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='43' column='1' id='type-id-277'>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='45' column='1' id='type-id-163'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -4821,11 +4773,9 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='_List_base&lt;coibuffer*, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-679'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-1083' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-682'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-984'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-765'/>
@@ -5012,11 +4962,9 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;PtrData*, std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-667'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-1086' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-670'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-974'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-759'/>
@@ -5204,43 +5152,33 @@ 
         </class-decl>
         <class-decl name='list&lt;coibuffer*, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-241'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-679'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-35' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-726'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1089' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-1088'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1091' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-1090'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-1092'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-1095' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-1094'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-1097' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-1096'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-1099' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-1098'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-1009'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-750' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-723'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-505' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-1100'/>
             </member-type>
@@ -5743,43 +5681,33 @@ 
         </class-decl>
         <class-decl name='list&lt;PtrData*, std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-225'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-667'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-709'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1106' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-1105'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1108' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-1107'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1110' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-1109'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-1112' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-1111'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-1114' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-1113'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-1116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-1115'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-999'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-741' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-706'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-497' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-1117'/>
             </member-type>
@@ -6282,43 +6210,33 @@ 
         </class-decl>
         <class-decl name='list&lt;PersistData, std::allocator&lt;PersistData&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-227'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-661'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-212' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-700'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1121' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-1120'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1123' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-1122'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1125' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-1124'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-1127' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-1126'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-1129' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-1128'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-1131' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-1130'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-994'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-738' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-697'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-493' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-1132'/>
             </member-type>
@@ -6820,11 +6738,9 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;PersistData, std::allocator&lt;PersistData&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-661'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-1135' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-664'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-969'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-756'/>
@@ -7005,43 +6921,33 @@ 
         </class-decl>
         <class-decl name='list&lt;TargetImage, std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-228'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-673'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-718'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1138' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-1137'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1140' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-1139'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-483' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-1141'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-1143' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-1142'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-1145' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-1144'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-1147' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-1146'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-1004'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-747' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-715'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-501' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-1148'/>
             </member-type>
@@ -7558,11 +7464,9 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;TargetImage, std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-673'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-1151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-676'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-979'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-762'/>
@@ -7743,43 +7647,33 @@ 
         </class-decl>
         <class-decl name='list&lt;DynLib, std::allocator&lt;DynLib&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-265'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-655'/>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-489' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-1153'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-691'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1155' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-1154'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1157' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-1156'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1159' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-1158'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-1161' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-1160'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-1163' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-1162'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-1165' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-1164'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-989'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-735' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-688'/>
             </member-type>
@@ -8281,7 +8175,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;DynLib, std::allocator&lt;DynLib&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-655'>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-964'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-753'/>
@@ -8316,7 +8209,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-1168' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-658'/>
             </member-type>
@@ -8465,8 +8357,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='80' column='1' id='type-id-729'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -8549,19 +8439,15 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1170'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1172'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1174'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1175'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1177' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1176'/>
           </member-type>
@@ -8633,22 +8519,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;coibuffer*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1178'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1179'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-765'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-360'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-505' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1177'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1181'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-907' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1182'/>
           </member-type>
@@ -8694,13 +8576,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1183'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1184'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1185'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1186'/>
           </member-type>
@@ -8725,23 +8605,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1188'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1190' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1189'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1191'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1192'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1193'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1194'/>
           </member-type>
@@ -8783,22 +8658,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;coibuffer*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-750'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-350'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1196'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-378' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1197'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-35' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1190'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1198'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-765' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1199'/>
                 </member-type>
@@ -8826,44 +8696,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;coibuffer**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1200'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1201'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1202'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1203'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1204'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1205'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;coibuffer*&gt;, std::_List_node&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1206'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1207'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1209'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1210'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1211'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1212'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1213'/>
           </member-type>
@@ -8935,22 +8797,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;PtrData*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1215'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1216'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;std::_List_node&lt;PtrData*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-759'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-356'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-497' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1214'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1217'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-903' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1218'/>
           </member-type>
@@ -8996,36 +8854,29 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1219'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1220'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1221'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1222'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1223'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1225' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1224'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1226'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1227'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1228'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1229'/>
           </member-type>
@@ -9067,22 +8918,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;PtrData*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-741'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-344'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1230'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-306' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1231'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1225'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1232'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-759' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1233'/>
                 </member-type>
@@ -9110,39 +8956,32 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;PtrData**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1234'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1235'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1236'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1237'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1238'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1239'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;PtrData*&gt;, std::_List_node&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1240'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1241'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;coibuffer*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-1093'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-1242'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-378' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-1243'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-377' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-1244'/>
           </member-type>
@@ -9229,23 +9068,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;coibuffer*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-1095'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1095' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-1249'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-506' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-1250'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-1251'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-376' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-1252'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-375' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-1253'/>
           </member-type>
@@ -9351,19 +9185,15 @@ 
       <typedef-decl name='true_type' type-id='type-id-1259' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='87' column='1' id='type-id-1102'/>
       <typedef-decl name='false_type' type-id='type-id-1260' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='90' column='1' id='type-id-1103'/>
       <class-decl name='_List_iterator&lt;PtrData*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-1110'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1110' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-1261'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-497' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='131' column='1' id='type-id-1262'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-306' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-1263'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-254' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-1264'/>
           </member-type>
@@ -9455,15 +9285,12 @@ 
       <class-decl name='initializer_list&lt;PtrData*&gt;' visibility='default' is-declaration-only='yes' id='type-id-1118'/>
       <class-decl name='allocator&lt;std::_List_node&lt;PersistData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-756'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-354'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-493' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1269'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1270'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-901' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1271'/>
           </member-type>
@@ -9521,23 +9348,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1272'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1274' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1273'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1275'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1276'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1277'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1278'/>
           </member-type>
@@ -9579,22 +9401,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;PersistData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-738'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-342'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1279'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1280'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-212' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1274'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1281'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-756' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1282'/>
                 </member-type>
@@ -9622,44 +9439,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;PersistData*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1283'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1284'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1285'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1286'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1287'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1288'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;PersistData&gt;, std::_List_node&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1289'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1290'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1291'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1269' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1292'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1293'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1294'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1295'/>
           </member-type>
@@ -9731,37 +9540,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;PersistData&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1296'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1297'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1298'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1299'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1300'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1301'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;PersistData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-1125'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1125' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-1302'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-493' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='131' column='1' id='type-id-1303'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-1304'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-301' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-1305'/>
           </member-type>
@@ -9854,19 +9656,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;PersistData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-1127'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1127' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-1310'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1125' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-1311'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-387' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-1312'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-386' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-1313'/>
           </member-type>
@@ -9964,15 +9762,12 @@ 
       <class-decl name='initializer_list&lt;PersistData&gt;' visibility='default' is-declaration-only='yes' id='type-id-1133'/>
       <class-decl name='allocator&lt;std::_List_node&lt;TargetImage&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-762'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-358'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-501' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1319'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1320'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-905' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1321'/>
           </member-type>
@@ -10030,23 +9825,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1322'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1324' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1323'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1325'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1326'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1327'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1328'/>
           </member-type>
@@ -10088,22 +9878,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;TargetImage&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-747'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-348'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1329'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1330'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1324'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1331'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-762' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1332'/>
                 </member-type>
@@ -10131,44 +9916,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;TargetImage*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1333'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1334'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1335'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1336'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1337'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1338'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;TargetImage&gt;, std::_List_node&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1339'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1340'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1341'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1319' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1342'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1343'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1344'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1345'/>
           </member-type>
@@ -10256,37 +10033,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;TargetImage&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1346'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1347'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1348'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1349'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1350'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1351'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;TargetImage&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-483'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-483' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-486'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-1352'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-307' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-1353'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-501' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='131' column='1' id='type-id-1354'/>
           </member-type>
@@ -10384,43 +10154,33 @@ 
       <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;TargetImage&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1147'/>
       <class-decl name='initializer_list&lt;TargetImage&gt;' visibility='default' is-declaration-only='yes' id='type-id-1149'/>
       <class-decl name='set&lt;PtrData, std::less&lt;PtrData&gt;, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='90' column='1' id='type-id-270'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-528' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='115' column='1' id='type-id-1355'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='103' column='1' id='type-id-885'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='104' column='1' id='type-id-888'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_compare' type-id='type-id-802' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='105' column='1' id='type-id-1356'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_compare' type-id='type-id-802' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='106' column='1' id='type-id-1357'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-744' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='107' column='1' id='type-id-882'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1359' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='130' column='1' id='type-id-1358'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1359' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='131' column='1' id='type-id-1360'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1362' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='132' column='1' id='type-id-1361'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1364' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='134' column='1' id='type-id-1363'/>
           </member-type>
@@ -10743,7 +10503,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;PtrData, PtrData, std::_Identity&lt;PtrData&gt;, std::less&lt;PtrData&gt;, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='357' column='1' id='type-id-528'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_node' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='457' column='1' id='type-id-1366'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -10779,7 +10538,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;PtrData&gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='590' column='1' id='type-id-921'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-771'/>
@@ -10834,59 +10592,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='482' column='1' id='type-id-1364'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-1371' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='360' column='1' id='type-id-532'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='365' column='1' id='type-id-918'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-654' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='366' column='1' id='type-id-1372'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Link_type' type-id='type-id-956' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='367' column='1' id='type-id-1370'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-643' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='368' column='1' id='type-id-1373'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-538'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-541'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-543' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='481' column='1' id='type-id-1374'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-744' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='484' column='1' id='type-id-535'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-618' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-1375'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-585' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='729' column='1' id='type-id-1359'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1377' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='731' column='1' id='type-id-1376'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1378' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1362'/>
           </member-type>
@@ -11525,11 +11269,9 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-771'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-364'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1381'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-956' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1382'/>
           </member-type>
@@ -11586,11 +11328,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='94' column='1' id='type-id-652'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='96' column='1' id='type-id-1383'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-654' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='97' column='1' id='type-id-1384'/>
           </member-type>
@@ -11650,19 +11390,15 @@ 
       <class-decl name='binary_function&lt;PtrData, PtrData, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='118' column='1' id='type-id-1386'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1387'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1388'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1389'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1390'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1391'/>
           </member-type>
@@ -11703,27 +11439,22 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;PtrData*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1392'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1393'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;PtrData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-744'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-346'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1394'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-771' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1395'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1396'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1397'/>
           </member-type>
@@ -11749,37 +11480,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1398'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1399'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1400'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1401'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;PtrData&gt;, std::_Rb_tree_node&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1402'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1403'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;PtrData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='174' column='1' id='type-id-618'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1383' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='184' column='1' id='type-id-1404'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-302' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='177' column='1' id='type-id-1405'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='178' column='1' id='type-id-1406'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-618' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='183' column='1' id='type-id-621'/>
           </member-type>
@@ -11867,27 +11591,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;PtrData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='244' column='1' id='type-id-585'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1384' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='256' column='1' id='type-id-1407'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-217' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1408'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-218' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1409'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-618' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='250' column='1' id='type-id-591'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-585' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-588'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-643' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='257' column='1' id='type-id-1410'/>
           </member-type>
@@ -12228,15 +11946,12 @@ 
       </class-decl>
       <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;PtrData&gt;, std::_Rb_tree_const_iterator&lt;PtrData&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1365'/>
       <class-decl name='initializer_list&lt;PtrData&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-792'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-218' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1418'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-1419'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-218' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1420'/>
           </member-type>
@@ -12347,47 +12062,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='map&lt;void const*, OffloadDescriptor*, std::less&lt;void const*&gt;, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-187'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-560' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='135' column='1' id='type-id-1421'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='99' column='1' id='type-id-835'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='mapped_type' type-id='type-id-207' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-838'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-863' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='101' column='1' id='type-id-841'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_compare' type-id='type-id-810' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='102' column='1' id='type-id-1422'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-783' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='103' column='1' id='type-id-832'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1424' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='149' column='1' id='type-id-1423'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1426' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='150' column='1' id='type-id-1425'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1428' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='151' column='1' id='type-id-1427'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1430' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='153' column='1' id='type-id-1429'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1432' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='154' column='1' id='type-id-1431'/>
           </member-type>
@@ -12757,7 +12461,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;void const*, std::pair&lt;void const* const, OffloadDescriptor*&gt;, std::_Select1st&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;, std::less&lt;void const*&gt;, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='357' column='1' id='type-id-560'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;void const*&gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='590' column='1' id='type-id-935'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-777'/>
@@ -12812,59 +12515,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='482' column='1' id='type-id-1428'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-1438' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='360' column='1' id='type-id-564'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='365' column='1' id='type-id-932'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-654' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='366' column='1' id='type-id-1439'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Link_type' type-id='type-id-960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='367' column='1' id='type-id-1440'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-651' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='368' column='1' id='type-id-1441'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-570'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-863' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-573'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-575' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='481' column='1' id='type-id-1442'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-783' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='484' column='1' id='type-id-567'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-630' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-1424'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-603' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='729' column='1' id='type-id-1426'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1443' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='731' column='1' id='type-id-1430'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1444' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1432'/>
           </member-type>
@@ -13500,11 +13189,9 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-777'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-368'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1448'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1449'/>
           </member-type>
@@ -13561,7 +13248,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pair&lt;void const* const, OffloadDescriptor*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-863'>
-
           <member-type access='public'>
             <typedef-decl name='first_type' type-id='type-id-1080' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='130' column='1' id='type-id-1450'/>
           </member-type>
@@ -13659,19 +13345,15 @@ 
       <class-decl name='binary_function&lt;void const*, void const*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='118' column='1' id='type-id-1456'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1457'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1458'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1459'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1460'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1461'/>
           </member-type>
@@ -13712,27 +13394,22 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1462'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1463'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-783'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-372'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1464'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-777' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1465'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1466'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1072' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1467'/>
           </member-type>
@@ -13758,41 +13435,33 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1468'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1469'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1470'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1471'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1472'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1473'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='174' column='1' id='type-id-630'>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='185' column='1' id='type-id-1474'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1383' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='184' column='1' id='type-id-1475'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1071' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='177' column='1' id='type-id-1476'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1072' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='178' column='1' id='type-id-1477'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-630' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='183' column='1' id='type-id-633'/>
           </member-type>
@@ -13873,23 +13542,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='244' column='1' id='type-id-603'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1384' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='256' column='1' id='type-id-1478'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-865' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1479'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-866' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1480'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-630' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='250' column='1' id='type-id-609'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-603' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-606'/>
           </member-type>
@@ -13989,47 +13653,36 @@ 
       <class-decl name='initializer_list&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1434'/>
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1435'/>
       <class-decl name='map&lt;long unsigned int, Stream*, std::less&lt;long unsigned int&gt;, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-231'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-544' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='135' column='1' id='type-id-1481'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='99' column='1' id='type-id-820'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='mapped_type' type-id='type-id-264' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-823'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-844' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='101' column='1' id='type-id-826'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_compare' type-id='type-id-806' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='102' column='1' id='type-id-1482'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-780' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='103' column='1' id='type-id-817'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1484' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='149' column='1' id='type-id-1483'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1486' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='150' column='1' id='type-id-1485'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1488' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='151' column='1' id='type-id-1487'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1490' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='153' column='1' id='type-id-1489'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1492' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='154' column='1' id='type-id-1491'/>
           </member-type>
@@ -14412,7 +14065,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;long unsigned int const, Stream*&gt;, std::_Select1st&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, std::less&lt;long unsigned int&gt;, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='357' column='1' id='type-id-544'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_node' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='457' column='1' id='type-id-1497'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -14441,7 +14093,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='590' column='1' id='type-id-928'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
@@ -14510,59 +14161,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='482' column='1' id='type-id-1488'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-1502' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='360' column='1' id='type-id-548'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='365' column='1' id='type-id-925'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-654' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='366' column='1' id='type-id-1503'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Link_type' type-id='type-id-958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='367' column='1' id='type-id-1501'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-647' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='368' column='1' id='type-id-1504'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-554'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-844' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-557'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-559' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='481' column='1' id='type-id-1505'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-780' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='484' column='1' id='type-id-551'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-624' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-1484'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-594' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='729' column='1' id='type-id-1486'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1506' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='731' column='1' id='type-id-1490'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1507' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1492'/>
           </member-type>
@@ -15250,11 +14887,9 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-774'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-366'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1510'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1511'/>
           </member-type>
@@ -15331,7 +14966,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pair&lt;long unsigned int const, Stream*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-844'>
-
           <member-type access='public'>
             <typedef-decl name='first_type' type-id='type-id-891' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='130' column='1' id='type-id-1512'/>
           </member-type>
@@ -15417,11 +15051,9 @@ 
       </class-decl>
       <class-decl name='bitset&lt;1024ul&gt;' size-in-bits='1024' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='749' column='1' id='type-id-195'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-476'/>
-
           <member-type access='private'>
             <typedef-decl name='_WordT' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='754' column='1' id='type-id-1514'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='reference' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='800' column='1' id='type-id-1515'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -15770,7 +15402,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Base_bitset&lt;16ul&gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='71' column='1' id='type-id-476'>
-
           <member-type access='public'>
             <typedef-decl name='_WordT' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='73' column='1' id='type-id-480'/>
           </member-type>
@@ -15966,19 +15597,15 @@ 
       <class-decl name='binary_function&lt;long unsigned int, long unsigned int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='118' column='1' id='type-id-1523'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1524'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1525'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1526'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1527'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1528'/>
           </member-type>
@@ -16019,27 +15646,22 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::pair&lt;long unsigned int const, Stream*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1529'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1530'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-780'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-370'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1531'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-774' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1532'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1533'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1060' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1534'/>
           </member-type>
@@ -16065,41 +15687,33 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1535'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1536'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1537'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1538'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1539'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1540'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='174' column='1' id='type-id-624'>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='185' column='1' id='type-id-1541'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1383' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='184' column='1' id='type-id-1542'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1059' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='177' column='1' id='type-id-1543'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1060' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='178' column='1' id='type-id-1544'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-624' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='183' column='1' id='type-id-627'/>
           </member-type>
@@ -16187,23 +15801,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='244' column='1' id='type-id-594'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1384' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='256' column='1' id='type-id-1545'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-846' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1546'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-847' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1547'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-624' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='250' column='1' id='type-id-600'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-594' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-597'/>
           </member-type>
@@ -16308,15 +15917,12 @@ 
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1495'/>
       <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1496'/>
       <class-decl name='initializer_list&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-795'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-847' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1548'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-1549'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-847' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1550'/>
           </member-type>
@@ -16362,15 +15968,12 @@ 
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1494'/>
       <class-decl name='allocator&lt;std::_List_node&lt;DynLib&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-753'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-352'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-489' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1551'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1552'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-899' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1553'/>
           </member-type>
@@ -16428,23 +16031,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1554'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1556' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1555'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1557'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1558'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1559'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1560'/>
           </member-type>
@@ -16486,24 +16084,19 @@ 
       </class-decl>
       <class-decl name='allocator&lt;DynLib&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-735'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-340'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1561'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-753' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1562'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1563'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-230' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1564'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1556'/>
           </member-type>
@@ -16529,44 +16122,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;DynLib*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1565'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1566'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1567'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1568'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1569'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1570'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;DynLib&gt;, std::_List_node&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1571'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1572'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1573'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1551' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1574'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1575'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1576'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1577'/>
           </member-type>
@@ -16638,37 +16223,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;DynLib&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1578'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1579'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1580'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1581'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1582'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1583'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;DynLib&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-1159'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1159' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-1584'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-489' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='131' column='1' id='type-id-1585'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-230' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-1586'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-299' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-1587'/>
           </member-type>
@@ -16755,19 +16333,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;DynLib&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-1161'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1161' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-1592'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1159' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-1593'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-382' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-1594'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-381' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-1595'/>
           </member-type>
@@ -16864,43 +16438,33 @@ 
       <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;DynLib&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1165'/>
       <class-decl name='initializer_list&lt;DynLib&gt;' visibility='default' is-declaration-only='yes' id='type-id-1166'/>
       <class-decl name='set&lt;AutoData, std::less&lt;AutoData&gt;, std::allocator&lt;AutoData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='90' column='1' id='type-id-267'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-512' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='115' column='1' id='type-id-1601'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='103' column='1' id='type-id-873'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='104' column='1' id='type-id-876'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_compare' type-id='type-id-798' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='105' column='1' id='type-id-1602'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_compare' type-id='type-id-798' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='106' column='1' id='type-id-1603'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-732' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='107' column='1' id='type-id-870'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1605' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='130' column='1' id='type-id-1604'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1605' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='131' column='1' id='type-id-1606'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1608' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='132' column='1' id='type-id-1607'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1610' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='134' column='1' id='type-id-1609'/>
           </member-type>
@@ -17223,7 +16787,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;AutoData, AutoData, std::_Identity&lt;AutoData&gt;, std::less&lt;AutoData&gt;, std::allocator&lt;AutoData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='357' column='1' id='type-id-512'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_node' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='457' column='1' id='type-id-1612'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -17252,7 +16815,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;AutoData&gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='590' column='1' id='type-id-914'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-768'/>
@@ -17307,59 +16869,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='482' column='1' id='type-id-1610'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-1617' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='360' column='1' id='type-id-516'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='365' column='1' id='type-id-911'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-654' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='366' column='1' id='type-id-1618'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Link_type' type-id='type-id-954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='367' column='1' id='type-id-1616'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-639' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='368' column='1' id='type-id-1619'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-522'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-525'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-527' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='481' column='1' id='type-id-1620'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-732' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='484' column='1' id='type-id-519'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-1621'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-576' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='729' column='1' id='type-id-1605'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1623' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='731' column='1' id='type-id-1622'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1624' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1608'/>
           </member-type>
@@ -17998,11 +17546,9 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-768'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-362'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1627'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1628'/>
           </member-type>
@@ -18072,19 +17618,15 @@ 
       <class-decl name='binary_function&lt;AutoData, AutoData, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='118' column='1' id='type-id-1629'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1630'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1631'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1632'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1633'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1634'/>
           </member-type>
@@ -18125,27 +17667,22 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;AutoData*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1635'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1636'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator&lt;AutoData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-732'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-338'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1637'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-768' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1638'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1639'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1640'/>
           </member-type>
@@ -18171,37 +17708,30 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-1641'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-1642'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1643'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1644'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;AutoData&gt;, std::_Rb_tree_node&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1645'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-1646'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;AutoData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='174' column='1' id='type-id-612'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1383' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='184' column='1' id='type-id-1647'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-298' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='177' column='1' id='type-id-1648'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='178' column='1' id='type-id-1649'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='183' column='1' id='type-id-615'/>
           </member-type>
@@ -18282,27 +17812,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;AutoData&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='244' column='1' id='type-id-576'>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-639' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='257' column='1' id='type-id-1650'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1384' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='256' column='1' id='type-id-1651'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-221' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1652'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-220' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1653'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='250' column='1' id='type-id-582'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-576' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-579'/>
           </member-type>
@@ -18465,15 +17989,12 @@ 
       </class-decl>
       <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;AutoData&gt;, std::_Rb_tree_const_iterator&lt;AutoData&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1611'/>
       <class-decl name='initializer_list&lt;AutoData&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-789'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-220' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1655'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-1656'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-220' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1657'/>
           </member-type>
@@ -18577,8 +18098,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
-
       <class-decl name='__aligned_membuf&lt;long unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='47' column='1' id='type-id-322'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_storage' type-id='type-id-182' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='54' column='1'/>
@@ -18615,23 +18134,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-360'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1658'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-907' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1659'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-508' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1660'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-906' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1661'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-507' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1662'/>
           </member-type>
@@ -18763,23 +18277,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;PtrData*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-356'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1663'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-903' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1664'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-500' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1665'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-902' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1666'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-499' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1667'/>
           </member-type>
@@ -18912,22 +18421,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1668'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1188'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1189' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-336'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-337' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-1089'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-420' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-1091'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;coibuffer*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1669'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1194' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1083'/>
                 </member-type>
@@ -18978,23 +18482,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;coibuffer*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-350'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1670'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-378' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1671'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-376' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1672'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-377' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1673'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-375' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1674'/>
           </member-type>
@@ -19057,7 +18556,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1675'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1170'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1172' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-1085'/>
           </member-type>
@@ -19107,22 +18605,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1676'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1223'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1224' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-332'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-333' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-1106'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-416' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-1108'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;PtrData*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1677'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1086'/>
                 </member-type>
@@ -19173,23 +18666,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;PtrData*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-344'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1678'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-306' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1679'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-305' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1680'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-254' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1681'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-304' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1682'/>
           </member-type>
@@ -19252,7 +18740,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1683'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1209'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-1087'/>
           </member-type>
@@ -19301,23 +18788,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;PersistData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-354'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1684'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-901' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1685'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-496' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1686'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-900' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1687'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-495' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1688'/>
           </member-type>
@@ -19443,22 +18925,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1689'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1272'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1273' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-330'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-331' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-1121'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-414' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-1123'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;PersistData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1690'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1278' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1135'/>
                 </member-type>
@@ -19509,23 +18986,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;PersistData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-342'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1691'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1692'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-387' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1693'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-301' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1694'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-386' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1695'/>
           </member-type>
@@ -19588,7 +19060,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1696'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1291'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1293' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-1136'/>
           </member-type>
@@ -19637,23 +19108,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;TargetImage&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-358'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1697'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-905' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1698'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-504' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1699'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-904' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1700'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-503' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1701'/>
           </member-type>
@@ -19787,22 +19253,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1702'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1322'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1323' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-334'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-335' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-1138'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-418' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-1140'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;TargetImage&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1703'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1328' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1151'/>
                 </member-type>
@@ -19853,23 +19314,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;TargetImage&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-348'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1704'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-211' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1705'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-390' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1706'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-307' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1707'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-201' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1708'/>
           </member-type>
@@ -19932,7 +19388,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1709'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1341'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1343' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-1152'/>
           </member-type>
@@ -19981,23 +19436,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-364'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1710'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-956' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1711'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-643' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1712'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-955' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1713'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-642' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1714'/>
           </member-type>
@@ -20135,10 +19585,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1715'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1387'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1716'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1391' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1371'/>
                 </member-type>
@@ -20189,23 +19637,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;PtrData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-346'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1717'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1718'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-218' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1719'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-302' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1720'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-217' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1721'/>
           </member-type>
@@ -20267,23 +19710,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-368'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1722'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1723'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-651' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1724'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-959' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1725'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-650' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1726'/>
           </member-type>
@@ -20417,10 +19855,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1727'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1457'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1728'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1461' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1438'/>
                 </member-type>
@@ -20471,23 +19907,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-372'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1729'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1072' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1730'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-866' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1731'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1071' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1732'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-865' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1733'/>
           </member-type>
@@ -20549,23 +19980,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-366'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1734'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1735'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-647' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1736'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-957' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1737'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-646' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1738'/>
           </member-type>
@@ -20727,10 +20153,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1739'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1524'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1740'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1528' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1502'/>
                 </member-type>
@@ -20781,23 +20205,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-370'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1741'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1060' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1742'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-847' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1743'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1059' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1744'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-846' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1745'/>
           </member-type>
@@ -20859,23 +20278,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;DynLib&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-352'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1746'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-899' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1747'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-492' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1748'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-898' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1749'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-491' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1750'/>
           </member-type>
@@ -21001,24 +20415,19 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1751'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1554'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;DynLib&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1752'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1560' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1168'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1555' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-328'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-329' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-1155'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-412' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-1157'/>
           </member-type>
@@ -21067,23 +20476,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;DynLib&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-340'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1753'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-230' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1754'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-382' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1755'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-299' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1756'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-381' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1757'/>
           </member-type>
@@ -21146,7 +20550,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1758'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1573'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1575' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-1169'/>
           </member-type>
@@ -21195,23 +20598,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-362'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1759'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1760'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-639' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1761'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-953' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1762'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-638' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1763'/>
           </member-type>
@@ -21343,10 +20741,8 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-1764'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1630'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-1765'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1634' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-1617'/>
                 </member-type>
@@ -21397,23 +20793,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;AutoData&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-338'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1766'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-1767'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-220' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-1768'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-298' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-1769'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-221' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-1770'/>
           </member-type>
@@ -21475,9 +20866,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <function-decl name='__offload_offload_call_count' mangled-name='__offload_offload_call_count' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__offload_offload_call_count'>
       <return type-id='type-id-25'/>
     </function-decl>
@@ -21564,9 +20952,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <type-decl name='char' size-in-bits='8' id='type-id-166'/>
@@ -21664,9 +21049,6 @@ 
     <pointer-type-def type-id='type-id-1773' size-in-bits='64' id='type-id-1772'/>
     <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-151'/>
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
-
-
-
     <function-decl name='__offload_malloc' mangled-name='_Z16__offload_mallocmm' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16__offload_mallocmm'>
       <parameter type-id='type-id-289' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='168' column='1'/>
       <parameter type-id='type-id-289' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='169' column='1'/>
@@ -21674,15 +21056,11 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='8192' id='type-id-1774'>
       <subrange length='128' type-id='type-id-4' id='type-id-1775'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='39936' id='type-id-1776'>
       <subrange length='624' type-id='type-id-4' id='type-id-1777'/>
-
     </array-type-def>
     <class-decl name='mutex_locker_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='123' column='1' id='type-id-1778'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -22035,25 +21413,16 @@ 
     <pointer-type-def type-id='type-id-1890' size-in-bits='64' id='type-id-1954'/>
     <reference-type-def kind='lvalue' type-id='type-id-1899' size-in-bits='64' id='type-id-1955'/>
     <namespace-decl name='std'>
-
-
-
-
-
       <class-decl name='move_iterator&lt;const VarTable::Entry**&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='998' column='1' id='type-id-1883'>
-
           <member-type access='private'>
             <typedef-decl name='iterator_type' type-id='type-id-1834' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1007' column='1' id='type-id-1956'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1010' column='1' id='type-id-1957'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1834' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1012' column='1' id='type-id-1959'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1017' column='1' id='type-id-1960'/>
           </member-type>
@@ -22161,25 +21530,20 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator_traits&lt;const VarTable::Entry**&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-1962'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-1963'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-1958'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1834' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='183' column='1' id='type-id-1965'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1833' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='184' column='1' id='type-id-1966'/>
           </member-type>
       </class-decl>
       <class-decl name='conditional&lt;true, const VarTable::Entry*&amp;&amp;, const VarTable::Entry*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2118' column='1' id='type-id-1967'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1833' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2119' column='1' id='type-id-1961'/>
           </member-type>
@@ -22190,7 +21554,6 @@ 
         <return type-id='type-id-190'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const VarTable::Entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-1968'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-1943'/>
           </member-type>
@@ -22230,15 +21593,12 @@ 
         <return type-id='type-id-1834'/>
       </function-decl>
       <class-decl name='iterator_traits&lt;const VarTable::Entry* const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='189' column='1' id='type-id-1969'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='193' column='1' id='type-id-1970'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1830' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='194' column='1' id='type-id-1971'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1829' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='195' column='1' id='type-id-1972'/>
           </member-type>
@@ -22313,22 +21673,17 @@ 
       </function-decl>
       <class-decl name='allocator&lt;const VarTable::Entry*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-1874'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1817'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1973'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1834' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1974'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-1975'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;const VarTable::Entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-1976'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1874' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1977'/>
                 </member-type>
@@ -22549,7 +21904,6 @@ 
         <return type-id='type-id-149'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const VarTable::Entry*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1978'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1941'/>
           </member-type>
@@ -22584,7 +21938,6 @@ 
         <return type-id='type-id-149'/>
       </function-decl>
       <class-decl name='remove_reference&lt;VarList::BufEntry&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1979'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1794' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1935'/>
           </member-type>
@@ -22642,7 +21995,6 @@ 
         <return type-id='type-id-149'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_node_base*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1980'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-961' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1951'/>
           </member-type>
@@ -22652,7 +22004,6 @@ 
         <return type-id='type-id-1411'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_node&lt;PtrData&gt;*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1981'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-956' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1949'/>
           </member-type>
@@ -22680,7 +22031,6 @@ 
         <return type-id='type-id-149'/>
       </function-decl>
       <class-decl name='remove_reference&lt;DynLib&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-1982'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-1929'/>
           </member-type>
@@ -22690,7 +22040,6 @@ 
         <return type-id='type-id-299'/>
       </function-decl>
       <class-decl name='remove_reference&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-1983'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-1939'/>
           </member-type>
@@ -22700,7 +22049,6 @@ 
         <return type-id='type-id-205'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_iterator&lt;PtrData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-1984'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-618' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-1945'/>
           </member-type>
@@ -22710,7 +22058,6 @@ 
         <return type-id='type-id-1417'/>
       </function-decl>
       <class-decl name='remove_reference&lt;PtrData&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-1985'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-1933'/>
           </member-type>
@@ -22732,7 +22079,6 @@ 
         <return type-id='type-id-149'/>
       </function-decl>
       <class-decl name='remove_reference&lt;DynLib&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1986'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1927'/>
           </member-type>
@@ -22742,7 +22088,6 @@ 
         <return type-id='type-id-1928'/>
       </function-decl>
       <class-decl name='remove_reference&lt;bool&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1987'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1937'/>
           </member-type>
@@ -22752,7 +22097,6 @@ 
         <return type-id='type-id-205'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_iterator&lt;PtrData&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1988'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-618' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1947'/>
           </member-type>
@@ -22762,7 +22106,6 @@ 
         <return type-id='type-id-1417'/>
       </function-decl>
       <class-decl name='remove_reference&lt;PtrData&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-1989'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-1931'/>
           </member-type>
@@ -22776,7 +22119,6 @@ 
         <return type-id='type-id-190'/>
       </function-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/random.h' line='451' column='1' id='type-id-1920'>
-
           <member-type access='private'>
             <typedef-decl name='result_type' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/random.h' line='482' column='1' id='type-id-1881'/>
           </member-type>
@@ -22894,23 +22236,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-1992'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1975' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-1993'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-1994'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-1995'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-1996'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-1997'/>
           </member-type>
@@ -22989,25 +22326,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;const VarTable::Entry**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-1999'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2000'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2001'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2002'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2003'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2004'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;const VarTable::Entry*&gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;const VarTable::Entry*&gt;, const VarTable::Entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2005'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2006'/>
           </member-type>
@@ -23031,7 +22364,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='72' column='1' id='type-id-1865'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='79' column='1' id='type-id-1906'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1874'/>
@@ -23080,15 +22412,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2009' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='77' column='1' id='type-id-2008'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2010' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='75' column='1' id='type-id-1868'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1874' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='110' column='1' id='type-id-1871'/>
           </member-type>
@@ -23209,15 +22538,12 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2011'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2012'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2013'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2014'/>
           </member-type>
@@ -23289,62 +22615,49 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_Rb_tree_node&lt;PtrData&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2015'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2016'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2017'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2018'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2019'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2020'/>
           </member-type>
       </class-decl>
       <class-decl name='vector&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='214' column='1' id='type-id-1890'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1865'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='226' column='1' id='type-id-1899'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2008' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='227' column='1' id='type-id-2021'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2023' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='229' column='1' id='type-id-2022'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2025' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='230' column='1' id='type-id-2024'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1802' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='231' column='1' id='type-id-2026'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1799' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='233' column='1' id='type-id-2027'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2029' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='234' column='1' id='type-id-2028'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2031' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='235' column='1' id='type-id-2030'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='236' column='1' id='type-id-1897'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1874' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='238' column='1' id='type-id-1894'/>
           </member-type>
@@ -23887,15 +23200,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry* const*, std::vector&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2029'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2031'/>
       <class-decl name='initializer_list&lt;const VarTable::Entry*&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-1878'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1830' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-2034'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-2035'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1830' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-2036'/>
           </member-type>
@@ -23943,15 +23253,12 @@ 
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/cpp_type_traits.h' line='72' column='1' id='type-id-2033'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2037'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2038'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2039'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2040'/>
           </member-type>
@@ -24023,34 +23330,28 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_Rb_tree_node&lt;AutoData&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2041'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2042'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2043'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2044'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2045'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2046'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2047'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2048'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2049'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2050'/>
           </member-type>
@@ -24149,19 +23450,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2051'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2052'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2053'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2054'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2055'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2056'/>
           </member-type>
@@ -24243,11 +23541,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-1909'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1575' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2058'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1574' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-1912'/>
           </member-type>
@@ -24352,7 +23648,6 @@ 
       <class-decl name='unary_function&lt;PtrData, PtrData&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='105' column='1' id='type-id-2060'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <namespace-decl name='__ops'>
         <class-decl name='_Iter_comp_val&lt;bool (*)(const VarTable::Entry*, const VarTable::Entry*)&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/predefined_ops.h' line='133' column='1' id='type-id-1811'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -24542,19 +23837,15 @@ 
         </function-decl>
       </namespace-decl>
       <class-decl name='__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-1802'>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-1963' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='758' column='1' id='type-id-2061'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-2062'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1966' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-2063'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1965' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-2064'/>
           </member-type>
@@ -24682,15 +23973,12 @@ 
         <return type-id='type-id-150'/>
       </function-decl>
       <class-decl name='__normal_iterator&lt;const VarTable::Entry* const*, std::vector&lt;const VarTable::Entry*, std::allocator&lt;const VarTable::Entry*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-1799'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1970' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-2065'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1972' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-2066'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1971' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-2067'/>
           </member-type>
@@ -24817,23 +24105,18 @@ 
         <return type-id='type-id-150'/>
       </function-decl>
       <class-decl name='new_allocator&lt;const VarTable::Entry*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-1817'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1998'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1834' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2068'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-1830' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2069'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1833' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2070'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1829' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2071'/>
           </member-type>
@@ -24931,26 +24214,20 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;const VarTable::Entry*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2072'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1992'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1993' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-1797'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1994' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-2009'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1798' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-2023'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1838' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-2025'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;const VarTable::Entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-2073'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1997' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-2010'/>
                 </member-type>
@@ -25001,9 +24278,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <function-decl name='operator new' mangled-name='_ZnwmPv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmPv'>
       <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-151' name='__p' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1'/>
@@ -25022,7 +24296,6 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_env.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <class-decl name='MicEnvVar' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='47' column='1' id='type-id-2074'>
-
         <member-type access='public'>
           <class-decl name='VarValue' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='72' column='1' id='type-id-2075'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -25068,7 +24341,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='CardEnvVars' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='87' column='1' id='type-id-2077'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -25447,43 +24719,33 @@ 
       <namespace-decl name='__cxx11'>
         <class-decl name='list&lt;MicEnvVar::VarValue*, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2078'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2206'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2076' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-2233'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-2350' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-2349'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-2352' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-2351'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-2176' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2353'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-2161' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-2354'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-2356' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-2355'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-2358' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-2357'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2321'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-2249' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2230'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-2192' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2319'/>
             </member-type>
@@ -25991,11 +25253,9 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;MicEnvVar::VarValue*, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2206'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-2360' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2209'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2302'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2258'/>
@@ -26188,43 +25448,33 @@ 
         </class-decl>
         <class-decl name='list&lt;MicEnvVar::CardEnvVars*, std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2080'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2200'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2079' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-2224'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-2363' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-2362'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-2365' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-2364'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-2170' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2366'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-2152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-2367'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-2369' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-2368'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-2371' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-2370'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2314'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-2246' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2221'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-2188' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2312'/>
             </member-type>
@@ -26726,11 +25976,9 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;MicEnvVar::CardEnvVars*, std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2200'>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-2373' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2203'/>
             </member-type>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2297'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2255'/>
@@ -26910,7 +26158,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;char*, std::allocator&lt;char*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2212'>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2307'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2261'/>
@@ -26945,7 +26192,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-2375' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2215'/>
             </member-type>
@@ -27095,43 +26341,33 @@ 
         </class-decl>
         <class-decl name='list&lt;char*, std::allocator&lt;char*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2236'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2212'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-2243'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-2378' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-2377'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-2380' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-2379'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-2182' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2381'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-2383' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-2382'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-2385' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-2384'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-2387' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-2386'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2328'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-2252' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2240'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-2196' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2326'/>
             </member-type>
@@ -27633,20 +26869,14 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
       <class-decl name='allocator&lt;std::_List_node&lt;char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2261'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2117'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2390'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2279' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2391'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2196' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2392'/>
           </member-type>
@@ -27708,15 +26938,12 @@ 
       </function-decl>
       <class-decl name='allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2258'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2115'/>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2192' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2393'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2277' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2394'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2395'/>
           </member-type>
@@ -27780,23 +27007,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2396'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2398' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2397'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2399'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2400'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2401'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-2402'/>
           </member-type>
@@ -27838,22 +27060,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;MicEnvVar::VarValue*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2249'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2109'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2403'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2094' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2404'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2076' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2398'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2405'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2258' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2406'/>
                 </member-type>
@@ -27881,44 +27098,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;MicEnvVar::VarValue**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2407'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2408'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2409'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2410'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2411'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2412'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;MicEnvVar::VarValue*&gt;, std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2413'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2414'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2415'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2393' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2416'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2417'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2418'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2419'/>
           </member-type>
@@ -27990,33 +27199,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2420'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2421'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2422'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2423'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2424'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2425'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;MicEnvVar::VarValue*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2176'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2176' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2179'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2094' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-2426'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-2427'/>
           </member-type>
@@ -28103,23 +27306,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;MicEnvVar::VarValue*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-2161'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2161' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-2164'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-2193' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-2428'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2176' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-2167'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2092' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-2429'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2091' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-2430'/>
           </member-type>
@@ -28217,15 +27415,12 @@ 
       <class-decl name='initializer_list&lt;MicEnvVar::VarValue*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2359'/>
       <class-decl name='allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2255'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2113'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2431'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2275' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2432'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2188' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2433'/>
           </member-type>
@@ -28283,23 +27478,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2434'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2436' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2435'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2437'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2438'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2439'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-2440'/>
           </member-type>
@@ -28341,22 +27531,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;MicEnvVar::CardEnvVars*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2246'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2107'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2441'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2089' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2442'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2079' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2436'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2443'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2255' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2444'/>
                 </member-type>
@@ -28384,44 +27569,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;MicEnvVar::CardEnvVars**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2445'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2446'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2447'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2448'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2449'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2450'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;MicEnvVar::CardEnvVars*&gt;, std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2451'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2452'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2453'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2433' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2454'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2455'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2456'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2457'/>
           </member-type>
@@ -28493,33 +27670,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2458'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2459'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2460'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2461'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2462'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2463'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;MicEnvVar::CardEnvVars*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2170'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2170' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2173'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2089' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-2464'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-2465'/>
           </member-type>
@@ -28606,23 +27777,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;MicEnvVar::CardEnvVars*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-2152'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-2155'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-2189' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-2466'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2170' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-2158'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2087' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-2467'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2086' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-2468'/>
           </member-type>
@@ -28727,19 +27893,15 @@ 
         <return type-id='type-id-2338'/>
       </function-decl>
       <class-decl name='_List_iterator&lt;char*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2182'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2182' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2185'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-2196' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='131' column='1' id='type-id-2469'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2082' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-2470'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2121' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-2471'/>
           </member-type>
@@ -28850,7 +28012,6 @@ 
         <return type-id='type-id-2182'/>
       </function-decl>
       <class-decl name='remove_reference&lt;char* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2472'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2119' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2347'/>
           </member-type>
@@ -28860,7 +28021,6 @@ 
         <return type-id='type-id-2389'/>
       </function-decl>
       <class-decl name='remove_reference&lt;MicEnvVar::VarValue* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2473'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2090' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2345'/>
           </member-type>
@@ -28870,7 +28030,6 @@ 
         <return type-id='type-id-2091'/>
       </function-decl>
       <class-decl name='remove_reference&lt;MicEnvVar::CardEnvVars* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2474'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2085' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2343'/>
           </member-type>
@@ -28887,19 +28046,15 @@ 
       </function-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2475'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2392' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2476'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2477'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2478'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2479'/>
           </member-type>
@@ -28971,19 +28126,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;char*&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2480'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2481'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2482'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2483'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2484'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2485'/>
           </member-type>
@@ -28999,11 +28151,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2290'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2477' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2487'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2476' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2293'/>
           </member-type>
@@ -29072,23 +28222,18 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2488'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2490' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2489'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2491'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2492'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2493'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-2494'/>
           </member-type>
@@ -29130,22 +28275,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2252'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2111'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2495'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2082' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2496'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2490'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2497'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2261' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2498'/>
                 </member-type>
@@ -29173,35 +28313,29 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;char**, void, std::__allocator_traits_base::__pointer, std::allocator&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2499'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2500'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2501'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2502'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2503'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2504'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;char*&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;char*&gt;, std::_List_node&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2505'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2506'/>
           </member-type>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2285'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2417' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2507'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2416' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2288'/>
           </member-type>
@@ -29269,11 +28403,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2280'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2455' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2508'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2454' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2283'/>
           </member-type>
@@ -29346,26 +28478,19 @@ 
       <class-decl name='initializer_list&lt;char*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2388'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
-
       <class-decl name='new_allocator&lt;std::_List_node&lt;char*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2117'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2509'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2279' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2510'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2199' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2511'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2278' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2512'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2198' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2513'/>
           </member-type>
@@ -29490,23 +28615,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2115'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2514'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2277' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2515'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2516'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2276' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2517'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2194' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2518'/>
           </member-type>
@@ -29638,22 +28758,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2519'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2396'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2397' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2104' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-2350'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2131' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-2352'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-2520'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2402' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-2360'/>
                 </member-type>
@@ -29704,23 +28819,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;MicEnvVar::VarValue*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2109'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2521'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2094' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2522'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2092' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2523'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2524'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2091' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2525'/>
           </member-type>
@@ -29783,7 +28893,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::VarValue*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2526'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2415'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2417' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-2361'/>
           </member-type>
@@ -29832,23 +28941,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2113'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2527'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2275' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2528'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2191' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2529'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2274' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2530'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2190' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2531'/>
           </member-type>
@@ -29974,22 +29078,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2532'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2434'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2435' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2101'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2102' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-2363'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2129' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-2365'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-2533'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2440' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-2373'/>
                 </member-type>
@@ -30040,23 +29139,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;MicEnvVar::CardEnvVars*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2107'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2534'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2089' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2535'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2087' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2536'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2537'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2086' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2538'/>
           </member-type>
@@ -30119,7 +29213,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2539'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2453'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2455' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-2374'/>
           </member-type>
@@ -30169,22 +29262,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2540'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2488'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2489' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2105'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2106' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-2378'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2133' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-2380'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;char*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-2541'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2494' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-2375'/>
                 </member-type>
@@ -30235,23 +29323,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;char*&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2111'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2542'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2082' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2543'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2120' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2544'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2121' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2545'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2389' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2546'/>
           </member-type>
@@ -30314,7 +29397,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;char*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2547'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2475'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2477' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-2376'/>
           </member-type>
@@ -30363,13 +29445,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='4096' id='type-id-2548'>
       <subrange length='512' type-id='type-id-4' id='type-id-2549'/>
-
     </array-type-def>
     <typedef-decl name='pthread_key_t' type-id='type-id-2' filepath='/usr/include/bits/pthreadtypes.h' line='163' column='1' id='type-id-2550'/>
     <enum-decl name='OffloadInitType' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='366' column='1' id='type-id-2551'>
@@ -30577,11 +29656,6 @@ 
     <pointer-type-def type-id='type-id-1454' size-in-bits='64' id='type-id-2694'/>
     <qualified-type-def type-id='type-id-1081' id='type-id-2695'/>
     <namespace-decl name='std'>
-
-
-
-
-
       <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1454'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2589'/>
         <member-function access='private'>
@@ -30780,7 +29854,6 @@ 
       <class-decl name='allocator_arg_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/uses_allocator.h' line='39' column='1' id='type-id-2696'/>
       <class-decl name='__uses_alloc0' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/uses_allocator.h' line='61' column='1' id='type-id-2697'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2698'/>
-
           <member-type access='public'>
             <class-decl name='_Sink' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/uses_allocator.h' line='63' column='1' id='type-id-2638'>
               <member-function access='public'>
@@ -31009,7 +30082,6 @@ 
         <return type-id='type-id-892'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void const* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2699'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1080' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2690'/>
           </member-type>
@@ -31019,7 +30091,6 @@ 
         <return type-id='type-id-1081'/>
       </function-decl>
       <class-decl name='remove_reference&lt;long unsigned int const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2700'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-891' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2670'/>
           </member-type>
@@ -31041,7 +30112,6 @@ 
       <class-decl name='_Index_tuple&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/utility' line='216' column='1' id='type-id-1452'/>
       <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='76' column='1' id='type-id-1453'/>
       <class-decl name='remove_reference&lt;const std::pair&lt;long unsigned int const, Stream*&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2701'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-845' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2666'/>
           </member-type>
@@ -31067,7 +30137,6 @@ 
         <return type-id='type-id-1035'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2702'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2680'/>
           </member-type>
@@ -31077,7 +30146,6 @@ 
         <return type-id='type-id-1414'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2703'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-958' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2678'/>
           </member-type>
@@ -31087,7 +30155,6 @@ 
         <return type-id='type-id-1415'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2704'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-774' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2682'/>
           </member-type>
@@ -31097,7 +30164,6 @@ 
         <return type-id='type-id-2683'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_node&lt;AutoData&gt;*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2705'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2676'/>
           </member-type>
@@ -31107,7 +30173,6 @@ 
         <return type-id='type-id-1416'/>
       </function-decl>
       <class-decl name='remove_reference&lt;TargetImage&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2706'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2658'/>
           </member-type>
@@ -31117,7 +30182,6 @@ 
         <return type-id='type-id-307'/>
       </function-decl>
       <class-decl name='remove_reference&lt;coibuffer* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2707'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-374' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2660'/>
           </member-type>
@@ -31127,7 +30191,6 @@ 
         <return type-id='type-id-375'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const PersistData&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2708'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-385' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2662'/>
           </member-type>
@@ -31137,7 +30200,6 @@ 
         <return type-id='type-id-386'/>
       </function-decl>
       <class-decl name='remove_reference&lt;PtrData* const&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2709'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-303' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2654'/>
           </member-type>
@@ -31147,7 +30209,6 @@ 
         <return type-id='type-id-304'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;void const* const&amp;&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2710'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1454' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2688'/>
           </member-type>
@@ -31157,7 +30218,6 @@ 
         <return type-id='type-id-1446'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_iterator&lt;AutoData&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2711'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2672'/>
           </member-type>
@@ -31167,7 +30227,6 @@ 
         <return type-id='type-id-1654'/>
       </function-decl>
       <class-decl name='remove_reference&lt;AutoData&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2712'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2652'/>
           </member-type>
@@ -31177,7 +30236,6 @@ 
         <return type-id='type-id-298'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const TargetImage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2713'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-389' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2664'/>
           </member-type>
@@ -31187,7 +30245,6 @@ 
         <return type-id='type-id-201'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2714'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1455' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2684'/>
           </member-type>
@@ -31197,7 +30254,6 @@ 
         <return type-id='type-id-1447'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::tuple&lt;long unsigned int const&amp;&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2715'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1513' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2686'/>
           </member-type>
@@ -31207,7 +30263,6 @@ 
         <return type-id='type-id-1509'/>
       </function-decl>
       <class-decl name='remove_reference&lt;const std::piecewise_construct_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2716'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2602' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2668'/>
           </member-type>
@@ -31217,7 +30272,6 @@ 
         <return type-id='type-id-1445'/>
       </function-decl>
       <class-decl name='remove_reference&lt;TargetImage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2717'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2656'/>
           </member-type>
@@ -31227,7 +30281,6 @@ 
         <return type-id='type-id-2657'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Rb_tree_iterator&lt;AutoData&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2718'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2674'/>
           </member-type>
@@ -31237,7 +30290,6 @@ 
         <return type-id='type-id-1654'/>
       </function-decl>
       <class-decl name='remove_reference&lt;AutoData&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2719'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2650'/>
           </member-type>
@@ -31307,15 +30359,12 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2720'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2721'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2722'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2723'/>
           </member-type>
@@ -31391,29 +30440,24 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2724'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2725'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2726'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2727'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2728'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2729'/>
           </member-type>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;coibuffer*&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2633'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1172' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2730'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1176' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2636'/>
           </member-type>
@@ -31481,11 +30525,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2618'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1293' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2731'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1292' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2621'/>
           </member-type>
@@ -31553,11 +30595,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;PtrData*&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2623'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2732'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2626'/>
           </member-type>
@@ -31661,11 +30701,9 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;AutoData, AutoData&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='105' column='1' id='type-id-2734'/>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2628'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1343' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2735'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1342' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2631'/>
           </member-type>
@@ -31733,7 +30771,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Base_bitset&lt;2ul&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='71' column='1' id='type-id-2556'>
-
           <member-type access='public'>
             <typedef-decl name='_WordT' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='73' column='1' id='type-id-2560'/>
           </member-type>
@@ -31911,11 +30948,9 @@ 
       </class-decl>
       <class-decl name='bitset&lt;128ul&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='749' column='1' id='type-id-2592'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-2556'/>
-
           <member-type access='private'>
             <typedef-decl name='_WordT' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='754' column='1' id='type-id-2643'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='reference' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='800' column='1' id='type-id-2596'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -32259,8 +31294,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
-
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2736'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2047'/>
         <member-function access='public' static='yes'>
@@ -32308,9 +31341,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <var-decl name='prefix' type-id='type-id-153' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='68' column='1'/>
     <var-decl name='console_enabled' type-id='type-id-25' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='64' column='1'/>
     <var-decl name='offload_number' type-id='type-id-25' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='69' column='1'/>
@@ -32853,43 +31883,33 @@ 
       <namespace-decl name='__cxx11'>
         <class-decl name='list&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2823'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2817'/>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2737' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='517' column='1' id='type-id-2830'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-2888' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-2887'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-2890' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-2889'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-2807' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2891'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-2798' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-2892'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-2894' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='524' column='1' id='type-id-2893'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-2896' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='525' column='1' id='type-id-2895'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='526' column='1' id='type-id-2859'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-2833' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2827'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node' type-id='type-id-2813' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-2857'/>
             </member-type>
@@ -33391,7 +32411,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_List_base&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2817'>
-
             <member-type access='protected'>
               <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-2852'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2836'/>
@@ -33426,7 +32445,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='_Node_alloc_type' type-id='type-id-2898' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2820'/>
             </member-type>
@@ -33575,20 +32593,14 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
       <class-decl name='allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2836'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2782'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2900'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2844' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2901'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2813' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2902'/>
           </member-type>
@@ -33649,7 +32661,6 @@ 
         <return type-id='type-id-2865'/>
       </function-decl>
       <class-decl name='remove_reference&lt;MyoTable&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-2903'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2737' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2868'/>
           </member-type>
@@ -33659,7 +32670,6 @@ 
         <return type-id='type-id-2774'/>
       </function-decl>
       <class-decl name='remove_reference&lt;MyoTable&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-2904'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2737' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-2866'/>
           </member-type>
@@ -33670,23 +32680,18 @@ 
       </function-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2905'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2907' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2906'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2908'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2909'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2910'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-2911'/>
           </member-type>
@@ -33728,22 +32733,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2833'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2780'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2912'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2739' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2913'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-2737' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2907'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2914'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2836' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2915'/>
                 </member-type>
@@ -33771,44 +32771,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;MyoTable*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2916'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2917'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2918'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2919'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2920'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2921'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;MyoTable&gt;, std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2922'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2923'/>
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-2924'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2902' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-2925'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-2926'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-2927'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-2928'/>
           </member-type>
@@ -33880,33 +32872,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__detector&lt;std::_List_node&lt;MyoTable&gt;*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2929'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2930'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-2931'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-2932'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-2933'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-2934'/>
           </member-type>
       </class-decl>
       <class-decl name='_List_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2807'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2807' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2810'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2739' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='136' column='1' id='type-id-2935'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2774' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='137' column='1' id='type-id-2936'/>
           </member-type>
@@ -33993,23 +32979,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_const_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-2798'>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-2798' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-2801'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Node' type-id='type-id-2814' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-2937'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2807' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='211' column='1' id='type-id-2804'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2786' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-2938'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-2939'/>
           </member-type>
@@ -34106,11 +33087,9 @@ 
       <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;MyoTable&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2896'/>
       <class-decl name='initializer_list&lt;MyoTable&gt;' visibility='default' is-declaration-only='yes' id='type-id-2897'/>
       <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-2845'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='48' column='1' id='type-id-2940'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2925' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-2848'/>
           </member-type>
@@ -34179,26 +33158,19 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
-
       <class-decl name='new_allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2782'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2941'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2844' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2942'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2816' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2943'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2843' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2944'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2815' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2945'/>
           </member-type>
@@ -34324,22 +33296,17 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2946'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2905'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2906' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2778'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2779' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-2888'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2791' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-2890'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-2947'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-2911' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-2898'/>
                 </member-type>
@@ -34390,23 +33357,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2780'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2948'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-2739' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-2949'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-2786' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-2950'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-2774' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-2951'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-2785' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-2952'/>
           </member-type>
@@ -34469,7 +33431,6 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-2953'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2924'/>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-2899'/>
           </member-type>
@@ -34518,9 +33479,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <function-decl name='__intel_cilk_for_64_offload' mangled-name='__intel_cilk_for_64_offload' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__intel_cilk_for_64_offload'>
       <parameter type-id='type-id-25' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1262' column='1'/>
       <parameter type-id='type-id-2882' name='copy_constructor' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1263' column='1'/>
@@ -34689,7 +33647,6 @@ 
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32' id='type-id-2957'>
       <subrange length='4' type-id='type-id-4' id='type-id-2958'/>
-
     </array-type-def>
     <typedef-decl name='omp_nest_lock_target_t' type-id='type-id-2959' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='307' column='1' id='type-id-2960'/>
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-2960' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='305' column='1' id='type-id-2959'>
@@ -34726,11 +33683,6 @@ 
     <pointer-type-def type-id='type-id-2964' size-in-bits='64' id='type-id-2969'/>
     <pointer-type-def type-id='type-id-2960' size-in-bits='64' id='type-id-2970'/>
     <pointer-type-def type-id='type-id-2968' size-in-bits='64' id='type-id-2971'/>
-
-
-
-
-
     <function-decl name='omp_test_nest_lock_target' mangled-name='omp_test_nest_lock_target' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='omp_test_nest_lock_target'>
       <parameter type-id='type-id-297' name='target_type' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='455' column='1'/>
       <parameter type-id='type-id-25' name='target_number' filepath='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' line='456' column='1'/>
@@ -34855,11 +33807,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
-
-
     <namespace-decl name='ORSL'>
       <function-decl name='release' mangled-name='_ZN4ORSL7releaseEi' filepath='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-25'/>
@@ -34879,11 +33826,9 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-150'/>
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='320' id='type-id-2972'>
       <subrange length='40' type-id='type-id-4' id='type-id-181'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-25'/>
     <type-decl name='short int' size-in-bits='16' id='type-id-2973'/>
@@ -34943,7 +33888,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='TableList&lt;FuncTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2975'>
-
         <member-type access='private'>
           <class-decl name='Node' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-2978'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -34957,7 +33901,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='Table' type-id='type-id-2980' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-2979'/>
         </member-type>
@@ -34997,7 +33940,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='VarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='139' column='1' id='type-id-2982'>
-
         <member-type access='public'>
           <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2983'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35016,7 +33958,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='FuncTable' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='85' column='1' id='type-id-2980'>
-
         <member-type access='public'>
           <class-decl name='Entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='93' column='1' id='type-id-2984'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35087,7 +34028,6 @@ 
     <typedef-decl name='uint64_t' type-id='type-id-6' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-56'/>
     <class-decl name='VarList' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='169' column='1' id='type-id-2993'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2994'/>
-
         <member-type access='private'>
           <class-decl name='BufEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='185' column='1' id='type-id-1794'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35146,7 +34086,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='MYOVarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='353' column='1' id='type-id-2997'>
-
         <member-type access='public'>
           <typedef-decl name='Entry' type-id='type-id-2775' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='354' column='1' id='type-id-2998'/>
         </member-type>
@@ -35157,7 +34096,6 @@ 
     <typedef-decl name='SharedTableEntry' type-id='type-id-3000' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='270' column='1' id='type-id-2775'/>
     <typedef-decl name='MyoiSharedVarEntry' type-id='type-id-3001' filepath='../../../gcc/liboffloadmic/include/myo/myoimpl.h' line='357' column='1' id='type-id-3000'/>
     <class-decl name='MYOFuncTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='383' column='1' id='type-id-3002'>
-
         <member-type access='public'>
           <typedef-decl name='Entry' type-id='type-id-2770' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='384' column='1' id='type-id-3003'/>
         </member-type>
@@ -35167,7 +34105,6 @@ 
     </class-decl>
     <typedef-decl name='FptrTableEntry' type-id='type-id-3005' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='286' column='1' id='type-id-2770'/>
     <class-decl name='MYOInitTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='410' column='1' id='type-id-3006'>
-
         <member-type access='public'>
           <typedef-decl name='Entry' type-id='type-id-2772' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='411' column='1' id='type-id-3007'/>
         </member-type>
@@ -35273,11 +34210,9 @@ 
       </member-function>
     </class-decl>
     <class-decl name='TableList&lt;MYOInitTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-3011'>
-
         <member-type access='private'>
           <typedef-decl name='Table' type-id='type-id-3006' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-3012'/>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-3013'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35327,11 +34262,9 @@ 
       </member-function>
     </class-decl>
     <class-decl name='TableList&lt;MYOFuncTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-3015'>
-
         <member-type access='private'>
           <typedef-decl name='Table' type-id='type-id-3002' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-3016'/>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-3017'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35381,11 +34314,9 @@ 
       </member-function>
     </class-decl>
     <class-decl name='TableList&lt;MYOVarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-3019'>
-
         <member-type access='private'>
           <typedef-decl name='Table' type-id='type-id-2997' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-3020'/>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-3021'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35561,11 +34492,9 @@ 
       </member-function>
     </class-decl>
     <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2994'>
-
         <member-type access='private'>
           <typedef-decl name='Table' type-id='type-id-2982' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-3029'/>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-3030'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -35645,9 +34574,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-224' size-in-bits='64' id='type-id-2996'/>
     <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-3010'/>
     <pointer-type-def type-id='type-id-3038' size-in-bits='64' id='type-id-2744'/>
-
-
-
     <var-decl name='__offload_entries' type-id='type-id-2974' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='202' column='1'/>
     <var-decl name='__offload_funcs' type-id='type-id-2974' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='203' column='1'/>
     <var-decl name='__offload_vars' type-id='type-id-2993' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='204' column='1'/>
@@ -35722,11 +34648,6 @@ 
     <pointer-type-def type-id='type-id-3042' size-in-bits='64' id='type-id-3048'/>
     <pointer-type-def type-id='type-id-3049' size-in-bits='64' id='type-id-3050'/>
     <namespace-decl name='std'>
-
-
-
-
-
       <class-decl name='_Setprecision' size-in-bits='32' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/iomanip' line='185' column='1' id='type-id-3051'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_n' type-id='type-id-25' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/iomanip' line='185' column='1'/>
@@ -35741,10 +34662,6 @@ 
         <return type-id='type-id-3052'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
     <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-3040'/>
     </function-decl>
@@ -35789,25 +34706,17 @@ 
     <var-decl name='offload_report_enabled' type-id='type-id-25' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='77' column='1'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='128' id='type-id-3055'>
       <subrange length='16' type-id='type-id-4' id='type-id-177'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='8' id='type-id-3056'>
       <subrange length='1' type-id='type-id-4' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='160' id='type-id-3057'>
       <subrange length='20' type-id='type-id-4' id='type-id-162'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='32' id='type-id-3058'>
       <subrange length='4' type-id='type-id-4' id='type-id-2958'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3059'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -35948,7 +34857,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-3074' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-3075'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-3076' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-3074'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-3074' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-3076'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-3077'>
             <data-member access='private'>
@@ -36194,7 +35102,6 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='72' column='1' id='type-id-1522'>
-
             <member-type access='private'>
               <union-decl name='__anonymous_union__3' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-3178'>
                 <data-member access='private'>
@@ -36205,7 +35112,6 @@ 
                 </data-member>
               </union-decl>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='107' column='1' id='type-id-3165'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3136'/>
@@ -36238,51 +35144,39 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-3180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='87' column='1' id='type-id-3179'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-3181' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='83' column='1' id='type-id-3134'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Char_alloc_type' type-id='type-id-3183' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='75' column='1' id='type-id-3182'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='allocator_type' type-id='type-id-3182' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='82' column='1' id='type-id-3131'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-3185' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='85' column='1' id='type-id-3184'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-3187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='86' column='1' id='type-id-3186'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_pointer' type-id='type-id-3189' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='88' column='1' id='type-id-3188'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-3100' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='89' column='1' id='type-id-3190'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-3097' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='91' column='1' id='type-id-3191'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reverse_iterator' type-id='type-id-3193' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='92' column='1' id='type-id-3192'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reverse_iterator' type-id='type-id-3195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='93' column='1' id='type-id-3194'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='__const_iterator' type-id='type-id-3191' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='103' column='1' id='type-id-3196'/>
             </member-type>
@@ -37592,27 +36486,19 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-3172'>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-3200' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='455' column='1' id='type-id-3152'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-3201' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='423' column='1' id='type-id-3150'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iostate' type-id='type-id-3202' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='392' column='1' id='type-id-3148'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='fmtflags' type-id='type-id-3125' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='317' column='1' id='type-id-3146'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='595' column='1' id='type-id-3046'>
               <data-member access='private' static='yes'>
@@ -37823,7 +36709,6 @@ 
         <return type-id='type-id-3125'/>
       </function-decl>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1259'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3203'/>
           </member-type>
@@ -37838,7 +36723,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1260'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3204'/>
           </member-type>
@@ -37855,28 +36739,22 @@ 
       <typedef-decl name='size_t' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='196' column='1' id='type-id-1084'/>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3136'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3103'/>
-
           <member-type access='private'>
             <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-3205'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-3136' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-3206'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-3207'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-3208'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-3209'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-166' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3210'/>
           </member-type>
@@ -37929,27 +36807,21 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-3211'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3212'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-3213'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='103' column='1' id='type-id-3214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-3215'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-3216'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-3217'/>
           </member-type>
@@ -37990,50 +36862,41 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__allocator_traits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='43' column='1' id='type-id-1171'>
-
           <member-type access='protected'>
             <typedef-decl name='__pointer' type-id='type-id-3208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1180'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='__c_pointer' type-id='type-id-3209' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-3218'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='__size_type' type-id='type-id-3207' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1187'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__rebind' type-id='type-id-3206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1208'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;char*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3219'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3220'/>
           </member-type>
       </class-decl>
       <typedef-decl name='__detected_or_t' type-id='type-id-3220' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1173'/>
       <class-decl name='__detector&lt;char const*, void, std::__allocator_traits_base::__c_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3221'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-3218' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3222'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-3223'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-3224'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3225'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3226'/>
           </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;char&gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;char&gt;, char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3227'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3228'/>
           </member-type>
@@ -38041,30 +36904,24 @@ 
       <typedef-decl name='__detected_or_t_' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-3229'/>
       <typedef-decl name='__alloc_rebind' type-id='type-id-3229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='74' column='1' id='type-id-1195'/>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3230'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-3231'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='183' column='1' id='type-id-3232'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='184' column='1' id='type-id-3233'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-190' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1964'/>
       <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='189' column='1' id='type-id-3234'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='193' column='1' id='type-id-3235'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='194' column='1' id='type-id-3236'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='195' column='1' id='type-id-3237'/>
           </member-type>
@@ -38072,15 +36929,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3193'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3195'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-3139'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-3238'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-3239'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-3240'/>
           </member-type>
@@ -38125,8 +36979,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
-
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/cstdlib' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-292'/>
         <parameter type-id='type-id-292'/>
@@ -38245,23 +37097,18 @@ 
         </data-member>
       </class-decl>
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-3103'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-3249'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3250'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3251'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3252'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3253'/>
           </member-type>
@@ -38350,36 +37197,28 @@ 
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-3254'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3211'/>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-3255'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-3217' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-3183'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-3212' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-3095'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-3213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-3180'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-3214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='60' column='1' id='type-id-3189'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-3216' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='61' column='1' id='type-id-3181'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-3096' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-3185'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-3107' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-3187'/>
           </member-type>
@@ -38428,15 +37267,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-3100'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-3231' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3256'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3233' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3257'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-3232' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3258'/>
           </member-type>
@@ -38537,15 +37373,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char const*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-3097'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-3235' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3259'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3237' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3260'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-3236' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3261'/>
           </member-type>
@@ -38967,7 +37800,6 @@ 
       <parameter type-id='type-id-25'/>
       <return type-id='type-id-1521'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-25'/>
       <parameter type-id='type-id-153'/>
@@ -39266,7 +38098,6 @@ 
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C99'>
     <array-type-def dimensions='1' type-id='type-id-3262' size-in-bits='1024' id='type-id-3263'>
       <subrange length='16' type-id='type-id-4' id='type-id-177'/>
-
     </array-type-def>
     <typedef-decl name='ORSLBusySet' type-id='type-id-3264' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='62' column='1' id='type-id-3265'/>
     <class-decl name='ORSLBusySet' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='52' column='1' id='type-id-3264'>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 0505bca6..1220bea1 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -266,17 +266,13 @@ 
     <elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-3'>
       <subrange length='40' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='384' id='type-id-7'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-10'/>
@@ -589,7 +585,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='hb_user_data_array_t' size-in-bits='832' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='70' column='1' id='type-id-17'>
-
         <member-type access='public'>
           <class-decl name='hb_user_data_item_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='71' column='1' id='type-id-6'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -758,45 +753,33 @@ 
     </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'>
-
-
-
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='512' id='type-id-62'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-64' size-in-bits='320' id='type-id-65'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
       <subrange length='5' type-id='type-id-4' id='type-id-66'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-67' size-in-bits='32' id='type-id-68'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='32' id='type-id-70'>
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <type-decl name='short int' size-in-bits='16' id='type-id-72'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-73'/>
     <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='32' id='type-id-75'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='32' id='type-id-77'>
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='64' id='type-id-78'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-79'/>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64' id='type-id-80'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-81'/>
     <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-82'>
@@ -807,7 +790,6 @@ 
     </enum-decl>
     <typedef-decl name='hb_buffer_t' type-id='type-id-83' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-84'/>
     <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-83'>
-
         <member-type access='public'>
           <typedef-decl name='scratch_buffer_t' type-id='type-id-10' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-85'/>
         </member-type>
@@ -1267,7 +1249,6 @@ 
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-107'/>
     <typedef-decl name='hb_codepoint_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-64'/>
     <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-106'>
-
         <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-109'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -1296,7 +1277,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__1' 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-117'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -1325,7 +1305,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__2' 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-118'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2462,10 +2441,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='8' id='type-id-131'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -2567,18 +2544,14 @@ 
   <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'>
     <array-type-def dimensions='1' type-id='type-id-185' size-in-bits='32' id='type-id-186'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-187' size-in-bits='128' id='type-id-188'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-189'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-190'>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-191'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2616,7 +2589,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-203'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2654,7 +2626,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-204'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2750,7 +2721,6 @@ 
       </member-function>
     </class-decl>
     <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-210'>
-
         <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-211'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -3164,7 +3134,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_sanitize_context_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-279'>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-369'/>
           </member-type>
@@ -5642,7 +5611,6 @@ 
       </class-decl>
       <typedef-decl name='OpenTypeFontFace' type-id='type-id-263' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-328'/>
       <class-decl name='TTCHeader' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-272'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-566'>
               <member-type access='private'>
@@ -5730,7 +5698,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='OpenTypeFontFile' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-268'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-571'>
               <data-member access='private'>
@@ -5967,7 +5934,6 @@ 
   </abi-instr>
   <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'>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-572'/>
-
     <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-146'/>
     </function-decl>
@@ -7012,51 +6978,38 @@ 
     </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'>
-
-
     <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='2048' id='type-id-668'>
       <subrange length='256' type-id='type-id-4' id='type-id-669'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='96' id='type-id-671'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-672' size-in-bits='64' id='type-id-673'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-257' size-in-bits='16' id='type-id-674'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-675' size-in-bits='32' id='type-id-676'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-564' size-in-bits='16' id='type-id-677'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-528' size-in-bits='16' id='type-id-678'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-679' size-in-bits='40' id='type-id-680'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-681' size-in-bits='32' id='type-id-682'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-683' size-in-bits='88' id='type-id-684'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-685'>
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-687'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -7416,7 +7369,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='CmapSubtable' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-710'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-823'>
               <data-member access='private'>
@@ -9079,172 +9031,129 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='32' id='type-id-841'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-842' size-in-bits='16' id='type-id-843'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-732' size-in-bits='24' id='type-id-844'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-845' size-in-bits='32' id='type-id-846'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-847' size-in-bits='32' id='type-id-848'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-849' size-in-bits='16' id='type-id-850'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-851' size-in-bits='16' id='type-id-852'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-853' size-in-bits='16' id='type-id-854'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='16' id='type-id-856'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-857' size-in-bits='16' id='type-id-858'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='16' id='type-id-860'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-861' size-in-bits='16' id='type-id-862'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-863' size-in-bits='16' id='type-id-864'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-865' size-in-bits='32' id='type-id-866'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-867' size-in-bits='16' id='type-id-868'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-869' size-in-bits='16' id='type-id-870'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-871' size-in-bits='16' id='type-id-872'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-873' size-in-bits='16' id='type-id-874'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-875' size-in-bits='16' id='type-id-876'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-877' size-in-bits='16' id='type-id-878'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-879' size-in-bits='16' id='type-id-880'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-882'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-883' size-in-bits='16' id='type-id-884'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-885' size-in-bits='16' id='type-id-886'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-887' size-in-bits='16' id='type-id-888'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-889' size-in-bits='16' id='type-id-890'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-891' size-in-bits='16' id='type-id-892'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-893' size-in-bits='48' id='type-id-894'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-895' size-in-bits='48' id='type-id-896'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-897' size-in-bits='48' id='type-id-898'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-899' size-in-bits='48' id='type-id-900'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-901' size-in-bits='16' id='type-id-902'>
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-903'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='2304' id='type-id-905'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='2048' id='type-id-907'>
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='512' id='type-id-910'>
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-911' size-in-bits='4352' id='type-id-912'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-913' size-in-bits='1280' id='type-id-914'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='64' id='type-id-915'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='192' id='type-id-916'>
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-917'>
-
         <member-type access='public'>
           <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-909'>
-
               <member-type access='public'>
                 <typedef-decl name='pause_func_t' type-id='type-id-919' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-918'/>
               </member-type>
@@ -9256,7 +9165,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <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-906'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9277,7 +9185,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-904'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -10104,7 +10011,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-978'>
-
         <member-type access='public'>
           <typedef-decl name='Lookup' type-id='type-id-980' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-979'/>
         </member-type>
@@ -10129,7 +10035,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-985'>
-
         <member-type access='public'>
           <typedef-decl name='Lookup' type-id='type-id-987' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-986'/>
         </member-type>
@@ -10981,7 +10886,6 @@ 
     <pointer-type-def type-id='type-id-1807' size-in-bits='64' id='type-id-1808'/>
     <namespace-decl name='OT'>
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1118'>
-
           <member-type access='public'>
             <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1119'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -11091,7 +10995,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1121'>
-
           <member-type access='public'>
             <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1122'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -11207,10 +11110,8 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1375'>
-
           <member-type access='public'>
             <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1377'>
-
                 <member-type access='public'>
                   <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1810'>
                     <underlying-type type-id='type-id-11'/>
@@ -11219,7 +11120,6 @@ 
                     <enumerator name='MATCH_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1811'>
                     <underlying-type type-id='type-id-11'/>
@@ -11228,7 +11128,6 @@ 
                     <enumerator name='SKIP_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <typedef-decl name='match_func_t' type-id='type-id-1394' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1812'/>
                 </member-type>
@@ -11320,7 +11219,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1379'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -11391,7 +11289,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1381'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -11465,11 +11362,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='recurse_func_t' type-id='type-id-1801' 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-1813'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1814'/>
           </member-type>
@@ -12252,7 +12147,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='FeatureParams' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1142'>
-
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1815'>
               <data-member access='private'>
@@ -12542,10 +12436,8 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1115'>
-
           <member-type access='public'>
             <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1116'>
-
                 <member-type access='private'>
                   <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1816'>
                     <data-member access='private'>
@@ -12601,7 +12493,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1817'>
               <data-member access='private'>
@@ -13011,7 +12902,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ClassDef' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1094'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1818'>
               <data-member access='private'>
@@ -13804,7 +13694,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='CaretValue' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1065'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1822'>
               <data-member access='private'>
@@ -14009,7 +13898,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='MarkGlyphSets' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1186'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1823'>
               <data-member access='private'>
@@ -14454,7 +14342,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='Anchor' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-995'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1826'>
               <data-member access='private'>
@@ -15193,11 +15080,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1383'>
-
           <member-type access='public'>
             <typedef-decl name='recurse_func_t' type-id='type-id-1803' 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-1829'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1830'/>
           </member-type>
@@ -15420,11 +15305,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1385'>
-
           <member-type access='public'>
             <typedef-decl name='recurse_func_t' type-id='type-id-1805' 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-1831'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1832'/>
           </member-type>
@@ -15728,7 +15611,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1389'>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1834'/>
           </member-type>
@@ -18297,7 +18179,6 @@ 
       </class-decl>
       <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1373'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
-
           <member-type access='public'>
             <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1854'>
               <underlying-type type-id='type-id-11'/>
@@ -19027,7 +18908,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1259'>
-
           <member-type access='public'>
             <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1262'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -19218,7 +19098,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1310'>
-
           <member-type access='public'>
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1856'>
               <underlying-type type-id='type-id-11'/>
@@ -19232,7 +19111,6 @@ 
               <enumerator name='ReverseChainSingle' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1857'>
               <member-type access='private'>
@@ -19333,7 +19211,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1305'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1862'>
               <data-member access='private'>
@@ -19404,7 +19281,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1387'>
-
           <member-type access='public'>
             <typedef-decl name='return_t' type-id='type-id-966' 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-1861'/>
           </member-type>
@@ -19573,7 +19449,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1151'>
-
           <member-type access='public'>
             <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1863'>
               <underlying-type type-id='type-id-11'/>
@@ -19873,7 +19748,6 @@ 
       </class-decl>
       <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
       <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1201'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1864'>
               <data-member access='private'>
@@ -19942,7 +19816,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-991'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1865'>
               <data-member access='private'>
@@ -20011,7 +19884,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1173'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1866'>
               <data-member access='private'>
@@ -20085,7 +19957,6 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1101'/>
       </class-decl>
       <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1101'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1867'>
               <data-member access='private'>
@@ -20152,7 +20023,6 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1074'/>
       </class-decl>
       <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1074'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1868'>
               <data-member access='private'>
@@ -20349,7 +20219,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1283'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1870'>
               <data-member access='private'>
@@ -20461,7 +20330,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='PosLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1266'>
-
           <member-type access='public'>
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1871'>
               <underlying-type type-id='type-id-11'/>
@@ -20476,7 +20344,6 @@ 
               <enumerator name='Extension' value='9'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1872'>
               <member-type access='private'>
@@ -20564,7 +20431,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='SinglePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1299'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1877'>
               <data-member access='private'>
@@ -20611,7 +20477,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='PairPos' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1253'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1878'>
               <data-member access='private'>
@@ -20658,7 +20523,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='CursivePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1124'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1879'>
               <data-member access='private'>
@@ -20702,7 +20566,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='MarkBasePos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1880'>
               <data-member access='private'>
@@ -20746,7 +20609,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='MarkLigPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1191'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1881'>
               <data-member access='private'>
@@ -20790,7 +20652,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='MarkMarkPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1195'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1882'>
               <data-member access='private'>
@@ -20843,7 +20704,6 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1133'/>
       </class-decl>
       <class-decl name='Extension&lt;OT::ExtensionPos&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1133'>
-
           <member-type access='protected'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1883'>
               <data-member access='private'>
@@ -22998,18 +22858,14 @@ 
   <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-1888' size-in-bits='7168' id='type-id-1889'>
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1890' size-in-bits='1024' id='type-id-1891'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1892' size-in-bits='2304' id='type-id-1893'>
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1894'>
-
         <member-type access='private'>
           <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1888'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -23039,7 +22895,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1890'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -23321,7 +23176,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1899'/>
     <pointer-type-def type-id='type-id-1897' size-in-bits='64' id='type-id-1901'/>
     <pointer-type-def type-id='type-id-1892' size-in-bits='64' id='type-id-1906'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-536'/>
@@ -23349,25 +23203,18 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1916' size-in-bits='64' id='type-id-1839'/>
     <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1838'/>
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-1836'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-101' size-in-bits='672' id='type-id-1917'>
       <subrange length='21' type-id='type-id-4' id='type-id-1918'/>
-
     </array-type-def>
     <class-decl name='indic_shape_plan_t' size-in-bits='1344' 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='507' column='1' id='type-id-1919'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -23504,30 +23351,22 @@ 
     <qualified-type-def type-id='type-id-1921' const='yes' id='type-id-1933'/>
     <pointer-type-def type-id='type-id-1933' size-in-bits='64' id='type-id-1930'/>
     <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1929'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1934'>
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-1935'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -23667,7 +23506,6 @@ 
     <pointer-type-def type-id='type-id-1955' size-in-bits='64' id='type-id-1938'/>
     <pointer-type-def type-id='type-id-1956' size-in-bits='64' id='type-id-1936'/>
     <pointer-type-def type-id='type-id-1957' size-in-bits='64' id='type-id-1937'/>
-
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <parameter type-id='type-id-212' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
       <parameter type-id='type-id-183' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
@@ -23733,13 +23571,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-1958' size-in-bits='65536' id='type-id-1959'>
       <subrange length='2048' type-id='type-id-4' id='type-id-1960'/>
-
     </array-type-def>
     <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-1961'>
-
         <member-type access='public'>
           <typedef-decl name='elt_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1958'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 167e119d..a32fc763 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -451,27 +451,19 @@ 
     <elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -492,7 +484,6 @@ 
     <type-decl name='int' size-in-bits='32' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='128' id='type-id-18'>
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <type-decl name='long double' size-in-bits='128' id='type-id-19'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-20'/>
@@ -1417,7 +1408,6 @@ 
     <typedef-decl name='__FILE' type-id='type-id-29' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-85'/>
     <typedef-decl name='mbstate_t' type-id='type-id-86' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-87'/>
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-86'>
-
         <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-88'>
             <data-member access='private'>
@@ -1545,7 +1535,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-75'>
-
         <member-type access='protected'>
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-91'/>
         </member-type>
@@ -1630,7 +1619,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='vtkPixelTransfer' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.h' line='35' column='1' id='type-id-104'>
-
         <member-type access='private'>
           <typedef-decl name='VTK_TT' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' line='19' column='1' id='type-id-105'/>
         </member-type>
@@ -2091,9 +2079,7 @@ 
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-260'/>
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
     <namespace-decl name='std'>
-
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-219'>
-
           <member-type access='private'>
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-221'>
               <data-member access='private' static='yes'>
@@ -2209,7 +2195,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-262'>
-
           <member-type access='public'>
             <typedef-decl name='fmtflags' type-id='type-id-263' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-149'/>
           </member-type>
@@ -2240,7 +2225,6 @@ 
         <enumerator name='_S_ios_fmtflags_end' value='65536'/>
       </enum-decl>
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-164'>
-
           <member-type access='public'>
             <typedef-decl name='iostate' type-id='type-id-264' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-167'/>
           </member-type>
@@ -2287,11 +2271,9 @@ 
         <enumerator name='_S_ios_iostate_end' value='65536'/>
       </enum-decl>
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-151'>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-265' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-154'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-266' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-156'/>
           </member-type>
@@ -3237,11 +3219,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-280'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-169'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-17' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-173'/>
           </member-type>
@@ -3344,14 +3324,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Deque_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-142'>
-
           <member-type access='protected'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-281'>
               <underlying-type type-id='type-id-24'/>
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-200'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-161'/>
@@ -4130,7 +4108,6 @@ 
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-22'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-68'/>
@@ -4277,7 +4254,6 @@ 
       <parameter type-id='type-id-119'/>
       <return type-id='type-id-17'/>
     </function-decl>
-
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-226'/>
       <return type-id='type-id-17'/>
@@ -4606,7 +4582,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkDataObject' visibility='default' is-declaration-only='yes' id='type-id-235'>
-
         <member-type access='private'>
           <enum-decl name='FieldAssociations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/DataModel/vtkDataObject.h' line='212' column='1' id='type-id-287'>
             <underlying-type type-id='type-id-24'/>
@@ -4692,7 +4667,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-289'>
-
         <member-type access='private'>
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-184'/>
         </member-type>
@@ -4859,7 +4833,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkTextureObject' visibility='default' is-declaration-only='yes' id='type-id-290'>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='88' column='1' id='type-id-291'>
             <underlying-type type-id='type-id-24'/>
@@ -4871,7 +4844,6 @@ 
             <enumerator name='NumberOfDepthFormats' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='65' column='1' id='type-id-292'>
             <underlying-type type-id='type-id-24'/>
@@ -4883,7 +4855,6 @@ 
             <enumerator name='NumberOfWrapModes' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='76' column='1' id='type-id-293'>
             <underlying-type type-id='type-id-24'/>
@@ -4938,7 +4909,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkPixelBufferObject' visibility='default' is-declaration-only='yes' id='type-id-247'>
-
         <member-type access='private'>
           <enum-decl name='BufferType' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkPixelBufferObject.h' line='265' column='1' id='type-id-295'>
             <underlying-type type-id='type-id-24'/>
@@ -4986,7 +4956,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkDataArrayTemplate&lt;float&gt;' visibility='default' is-declaration-only='yes' id='type-id-233'>
-
         <member-type access='private'>
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-296'>
             <underlying-type type-id='type-id-24'/>
@@ -5019,8 +4988,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <class-decl name='vtkImageNoiseSource' visibility='default' is-declaration-only='yes' id='type-id-241'/>
     <class-decl name='vtkInformationVector' visibility='default' is-declaration-only='yes' id='type-id-243'/>
     <class-decl name='vtkPointData' visibility='default' is-declaration-only='yes' id='type-id-254'/>
@@ -5040,10 +5007,8 @@ 
     <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-258'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-63'>
       <subrange length='6' type-id='type-id-4' id='type-id-297'/>
-
     </array-type-def>
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-65'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-75'/>
@@ -5146,9 +5111,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-65' size-in-bits='64' id='type-id-299'/>
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-298'/>
     <namespace-decl name='std'>
-
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-302'>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-309'/>
           </member-type>
@@ -5173,31 +5136,23 @@ 
         <return type-id='type-id-214'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <function-type size-in-bits='64' id='type-id-308'>
       <parameter type-id='type-id-214'/>
       <return type-id='type-id-214'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-310'>
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='256' id='type-id-312'>
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-56' size-in-bits='128' id='type-id-313'>
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='64' id='type-id-314'>
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <class-decl name='vtkPainterCommunicator' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPainterCommunicator.h' line='30' column='1' id='type-id-315'>
       <member-function access='private' constructor='yes'>
@@ -5287,7 +5242,6 @@ 
     </class-decl>
     <class-decl name='vtkLineIntegralConvolution2D' size-in-bits='1792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='105' column='1' id='type-id-320'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-286'/>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='149' column='1' id='type-id-321'>
             <underlying-type type-id='type-id-24'/>
@@ -6318,7 +6272,6 @@ 
     <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-279'/>
     <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-325'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator-&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-147'/>
         <parameter type-id='type-id-147'/>
@@ -6537,7 +6490,6 @@ 
         <return type-id='type-id-253'/>
       </function-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-373'>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-423'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -6551,7 +6503,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-377'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-423'/>
@@ -6652,7 +6603,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-405'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-358'/>
@@ -7724,7 +7674,6 @@ 
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' is-declaration-only='yes' id='type-id-274'/>
       <typedef-decl name='string' type-id='type-id-373' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-428'/>
       <class-decl name='_Vector_base&lt;vtkPixelBufferObject*, std::allocator&lt;vtkPixelBufferObject*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-355'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-394'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-364'/>
@@ -8172,7 +8121,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;float, std::allocator&lt;float&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-352'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-391'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-361'/>
@@ -9032,8 +8980,6 @@ 
       </class-decl>
       <class-decl name='__normal_iterator&lt;const float*, std::vector&lt;float, std::allocator&lt;float&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-437'/>
     </namespace-decl>
-
-
     <namespace-decl name='vtkLineIntegralConvolution2DUtil'>
       <function-decl name='GetVectorLookupProgram' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-17'/>
@@ -9076,14 +9022,9 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <class-decl name='vtkStructuredGridLIC2D' size-in-bits='1472' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.h' line='51' column='1' id='type-id-449'>
@@ -9410,9 +9351,6 @@ 
     <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-468'/>
     <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-453'/>
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-451'/>
-
-
-
     <namespace-decl name='detail'>
       <class-decl name='vtkAtomicIntImpl&lt;int&gt;' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Common/Core/vtkAtomicInt.h' line='85' column='1' id='type-id-457'>
         <data-member access='protected' layout-offset-in-bits='0'>
@@ -9494,8 +9432,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <class-decl name='vtkSurfaceLICComposite' size-in-bits='3584' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.h' line='38' column='1' id='type-id-471'>
@@ -9843,7 +9779,6 @@ 
     <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-472'/>
     <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-475'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator==&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-147'/>
         <parameter type-id='type-id-147'/>
@@ -10337,8 +10272,6 @@ 
         <return type-id='type-id-46'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <class-decl name='vtkSurfaceLICDefaultPainter' size-in-bits='1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.h' line='37' column='1' id='type-id-493'>
@@ -10513,7 +10446,6 @@ 
     </class-decl>
     <class-decl name='vtkSurfaceLICPainter' size-in-bits='2880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='67' column='1' id='type-id-504'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-505'/>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-506'>
             <underlying-type type-id='type-id-24'/>
@@ -10523,7 +10455,6 @@ 
             <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-507'>
             <underlying-type type-id='type-id-24'/>
@@ -10533,7 +10464,6 @@ 
             <enumerator name='COMPOSITE_AUTO' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='protected'>
           <class-decl name='vtkInternals' size-in-bits='3392' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='824' column='1' id='type-id-508'>
             <data-member access='private' layout-offset-in-bits='0'>
@@ -11738,12 +11668,7 @@ 
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-495'/>
     <reference-type-def kind='lvalue' type-id='type-id-500' size-in-bits='64' id='type-id-503'/>
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-501'/>
-
-
-
-
     <class-decl name='vtkPainter' visibility='default' is-declaration-only='yes' id='type-id-505'>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/Core/vtkPainter.h' line='100' column='1' id='type-id-551'>
             <underlying-type type-id='type-id-24'/>
@@ -11899,20 +11824,15 @@ 
     <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-549'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-524'>
       <subrange length='3' type-id='type-id-4' id='type-id-552'/>
-
     </array-type-def>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-553'/>
     <array-type-def dimensions='1' type-id='type-id-554' size-in-bits='512' id='type-id-509'>
       <subrange length='8' type-id='type-id-4' id='type-id-555'/>
-
     </array-type-def>
     <typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-556'/>
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-557'>
-
         <member-type access='protected'>
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-558'/>
         </member-type>
@@ -13765,7 +13685,6 @@ 
     <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-585'/>
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-528'/>
     <namespace-decl name='std'>
-
       <function-decl name='uninitialized_copy&lt;std::_Deque_iterator&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-145'/>
         <parameter type-id='type-id-145'/>
@@ -13796,7 +13715,6 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='_Vector_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-630'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-161'/>
@@ -14241,8 +14159,6 @@ 
       <class-decl name='__normal_iterator&lt;vtkPixelExtent*, std::vector&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-685'/>
       <class-decl name='__normal_iterator&lt;const vtkPixelExtent*, std::vector&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-686'/>
     </namespace-decl>
-
-
     <namespace-decl name='vtkSurfaceLICPainterUtil'>
       <function-decl name='ilog2' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-13'/>
@@ -14317,7 +14233,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='RandomNoise2D' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='299' column='1' id='type-id-678'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='319' column='1' id='type-id-689'>
               <underlying-type type-id='type-id-24'/>
@@ -14421,7 +14336,6 @@ 
       </class-decl>
     </namespace-decl>
     <class-decl name='vtkLightingHelper' visibility='default' is-declaration-only='yes' id='type-id-671'>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkLightingHelper.h' line='42' column='1' id='type-id-690'>
             <underlying-type type-id='type-id-24'/>
@@ -14542,8 +14456,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <class-decl name='vtkBackgroundColorMonitor' visibility='default' is-declaration-only='yes' id='type-id-664'/>
     <class-decl name='vtkCellData' visibility='default' is-declaration-only='yes' id='type-id-665'/>
     <class-decl name='vtkColorMaterialHelper' visibility='default' is-declaration-only='yes' id='type-id-666'/>
@@ -14573,10 +14485,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
     <var-decl name='vtkLineIntegralConvolution2D_AAH' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAH' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAH'/>
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 391968eb..8f10a9af 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -795,12 +795,6 @@ 
     <elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
     <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='src/base/dynamic_annotations.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
@@ -811,10 +805,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-4'>
       <subrange length='16' type-id='type-id-5' id='type-id-6'/>
-
     </array-type-def>
     <class-decl name='Elf64_Sym' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/elf.h' line='389' column='1' id='type-id-7'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -972,9 +964,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-49' size-in-bits='64' id='type-id-50'/>
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-51'/>
     <namespace-decl name='base'>
-
       <class-decl name='ElfMemImage' size-in-bits='576' visibility='default' filepath='./src/base/elf_mem_image.h' line='56' column='1' id='type-id-23'>
-
           <member-type access='private'>
             <class-decl name='SymbolInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/base/elf_mem_image.h' line='64' column='1' id='type-id-25'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -991,7 +981,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='SymbolIterator' size-in-bits='384' visibility='default' filepath='./src/base/elf_mem_image.h' line='73' column='1' id='type-id-27'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -1196,10 +1185,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-58' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-59'/>
@@ -1207,7 +1192,6 @@ 
     <typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-60'/>
     <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-58'/>
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-63'/>
-
     <function-decl name='TCMalloc_ListAllProcessThreads' mangled-name='TCMalloc_ListAllProcessThreads' filepath='src/base/linuxthreads.cc' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='TCMalloc_ListAllProcessThreads'>
       <parameter type-id='type-id-53' name='parameter' filepath='src/base/linuxthreads.cc' line='551' column='1'/>
       <parameter type-id='type-id-59' name='callback' filepath='src/base/linuxthreads.cc' line='552' column='1'/>
@@ -1228,15 +1212,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <var-decl name='FLAGS_verbose' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead13FLAGS_verboseE' visibility='default' filepath='./src/base/logging.h' line='76' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead13FLAGS_verboseE'/>
       <var-decl name='FLAGS_noverbose' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE' visibility='default' filepath='src/base/logging.cc' line='40' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE'/>
     </namespace-decl>
-
     <function-decl name='RawClose' mangled-name='_Z8RawClosei' filepath='src/base/logging.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8RawClosei'>
       <parameter type-id='type-id-67'/>
       <return type-id='type-id-56'/>
@@ -1253,20 +1232,12 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-68' size-in-bits='1920' id='type-id-69'>
       <subrange length='30' type-id='type-id-5' id='type-id-70'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-68'/>
-
-
-
-
-
     <namespace-decl name='low_level_alloc_internal'>
       <class-decl name='AllocList' size-in-bits='2240' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='67' column='1' id='type-id-71'>
-
           <member-type access='public'>
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='68' column='1' id='type-id-72'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -1294,7 +1265,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <class-decl name='CycleClock' size-in-bits='8' is-struct='yes' visibility='default' filepath='./src/base/cycleclock.h' line='79' column='1' id='type-id-75'>
@@ -1305,19 +1275,12 @@ 
       </member-function>
     </class-decl>
     <namespace-decl name='base'>
-
-
       <function-decl name='SubmitSpinLockProfileData' mangled-name='_ZN4base25SubmitSpinLockProfileDataEPKvl' filepath='./src/base/synchronization_profiling.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base25SubmitSpinLockProfileDataEPKvl'>
         <parameter type-id='type-id-53'/>
         <parameter type-id='type-id-76'/>
         <return type-id='type-id-56'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-77' const='yes' id='type-id-78'/>
@@ -1360,21 +1323,15 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='80' id='type-id-83'>
       <subrange length='10' type-id='type-id-5' id='type-id-84'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='40960' id='type-id-85'>
       <subrange length='5120' type-id='type-id-5' id='type-id-86'/>
-
     </array-type-def>
     <class-decl name='ProcMapsIterator' size-in-bits='640' visibility='default' filepath='./src/base/sysinfo.h' line='102' column='1' id='type-id-87'>
-
         <member-type access='private'>
           <class-decl name='Buffer' size-in-bits='40960' is-struct='yes' visibility='default' filepath='./src/base/sysinfo.h' line='104' column='1' id='type-id-88'>
             <data-member access='public' static='yes'>
@@ -1520,11 +1477,6 @@ 
     <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-99'/>
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-98'/>
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-96'/>
-
-
-
-
-
     <function-decl name='HasPosixThreads' mangled-name='_Z15HasPosixThreadsv' filepath='src/base/sysinfo.cc' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15HasPosixThreadsv'>
       <return type-id='type-id-55'/>
     </function-decl>
@@ -1551,7 +1503,6 @@ 
       <parameter type-id='type-id-52' name='name' filepath='src/base/sysinfo.cc' line='122' column='1'/>
       <return type-id='type-id-52'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-103'/>
@@ -1575,11 +1526,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='VDSOSupport' size-in-bits='576' visibility='default' filepath='./src/base/vdso_support.h' line='72' column='1' id='type-id-104'>
-
           <member-type access='private'>
             <typedef-decl name='SymbolInfo' type-id='type-id-25' filepath='./src/base/vdso_support.h' line='76' column='1' id='type-id-106'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='SymbolIterator' type-id='type-id-27' filepath='./src/base/vdso_support.h' line='77' column='1' id='type-id-111'/>
           </member-type>
@@ -1659,10 +1608,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
@@ -1671,7 +1616,6 @@ 
     <qualified-type-def type-id='type-id-117' const='yes' id='type-id-118'/>
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
     <namespace-decl name='std'>
-
       <function-decl name='max&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-113'/>
         <parameter type-id='type-id-113'/>
@@ -1683,11 +1627,7 @@ 
         <return type-id='type-id-116'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='tcmalloc'>
-
       <function-decl name='DLL_IsEmpty' filepath='src/span.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-119'/>
         <return type-id='type-id-55'/>
@@ -1710,7 +1650,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <class-decl name='HeapLeakCheckerGlobalPrePost' size-in-bits='8' visibility='default' filepath='src/heap-checker-bcad.cc' line='60' column='1' id='type-id-121'>
@@ -1732,26 +1671,17 @@ 
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-
-
-
-
     <var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-55' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='infinite' id='type-id-123'>
       <subrange length='infinite' id='type-id-124'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='256' id='type-id-125'>
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='2048' id='type-id-127'>
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <class-decl name='AllocObject' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='356' column='1' id='type-id-129'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1978,7 +1908,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-151'>
-
         <member-type access='private'>
           <typedef-decl name='VoidFunction' type-id='type-id-153' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-152'/>
         </member-type>
@@ -2006,7 +1935,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='MemoryRegionMap' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='69' column='1' id='type-id-157'>
-
         <member-type access='private'>
           <class-decl name='RegionCmp' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='245' column='1' id='type-id-158'>
             <member-function access='public'>
@@ -2019,7 +1947,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Region' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='137' column='1' id='type-id-161'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2100,7 +2027,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='MyAllocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='252' column='1' id='type-id-164'>
             <member-function access='public' static='yes'>
@@ -2118,11 +2044,9 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='RegionSet' type-id='type-id-166' filepath='src/memory_region_map.h' line='263' column='1' id='type-id-165'/>
         </member-type>
-
         <member-type access='private'>
           <union-decl name='RegionSetRep' size-in-bits='384' visibility='default' filepath='src/memory_region_map.cc' line='177' column='1' id='type-id-167'>
             <data-member access='private'>
@@ -2139,7 +2063,6 @@ 
             </member-function>
           </union-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='LockHolder' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='126' column='1' id='type-id-171'>
             <member-function access='private' constructor='yes'>
@@ -2171,7 +2094,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='RegionIterator' type-id='type-id-175' filepath='src/memory_region_map.h' line='268' column='1' id='type-id-174'/>
         </member-type>
@@ -2385,10 +2307,8 @@ 
       </member-function>
     </class-decl>
     <class-decl name='HeapProfileTable' size-in-bits='832' visibility='default' filepath='src/heap-profile-table.h' line='51' column='1' id='type-id-187'>
-
         <member-type access='private'>
           <class-decl name='AllocValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='190' column='1' id='type-id-188'>
-
               <member-type access='private'>
                 <typedef-decl name='Bucket' type-id='type-id-190' filepath='src/heap-profile-table.h' line='187' column='1' id='type-id-189'/>
               </member-type>
@@ -2448,10 +2368,8 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='DumpArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='242' column='1' id='type-id-194'>
-
               <member-type access='public'>
                 <typedef-decl name='Stats' type-id='type-id-141' filepath='src/heap-profile-table.h' line='63' column='1' id='type-id-195'/>
               </member-type>
@@ -2471,10 +2389,8 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Snapshot' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='347' column='1' id='type-id-198'>
-
               <member-type access='private'>
                 <class-decl name='Entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='514' column='1' id='type-id-199'>
                   <data-member access='public' layout-offset-in-bits='0'>
@@ -2501,7 +2417,6 @@ 
                   </member-function>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <class-decl name='ReportState' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='528' column='1' id='type-id-203'>
                   <data-member access='public' layout-offset-in-bits='0'>
@@ -2590,7 +2505,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='AddNonLiveArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='305' column='1' id='type-id-214'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2601,7 +2515,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='AllocInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='66' column='1' id='type-id-215'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2621,7 +2534,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='AllocContextInfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='77' column='1' id='type-id-216'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-141'/>
@@ -2633,27 +2545,21 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='Allocator' type-id='type-id-217' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-209'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='DeAllocator' type-id='type-id-218' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-210'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='AllocationMap' type-id='type-id-219' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-205'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='AllocIterator' type-id='type-id-221' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-220'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='AllocContextIterator' type-id='type-id-223' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-222'/>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='BufferArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='227' column='1' id='type-id-224'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -2945,7 +2851,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='LowLevelAlloc' size-in-bits='8' visibility='default' filepath='src/base/low_level_alloc.h' line='44' column='1' id='type-id-237'>
-
         <member-type access='private'>
           <class-decl name='Arena' size-in-bits='2560' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='184' column='1' id='type-id-238'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -3023,7 +2928,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='HeapLeakChecker' size-in-bits='448' visibility='default' filepath='src/gperftools/heap-checker.h' line='78' column='1' id='type-id-239'>
-
         <member-type access='private'>
           <class-decl name='Disabler' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='175' column='1' id='type-id-240'>
             <member-function access='private' constructor='yes'>
@@ -3055,7 +2959,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='ShouldSymbolize' filepath='./src/gperftools/heap-checker.h' line='225' column='1' id='type-id-243'>
             <underlying-type type-id='type-id-133'/>
@@ -3063,7 +2966,6 @@ 
             <enumerator name='DO_NOT_SYMBOLIZE' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='ProcMapsTask' filepath='./src/gperftools/heap-checker.h' line='295' column='1' id='type-id-244'>
             <underlying-type type-id='type-id-133'/>
@@ -3071,7 +2973,6 @@ 
             <enumerator name='DISABLE_LIBRARY_ALLOCS' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='ProcMapsResult' filepath='./src/gperftools/heap-checker.h' line='301' column='1' id='type-id-245'>
             <underlying-type type-id='type-id-133'/>
@@ -3080,7 +2981,6 @@ 
             <enumerator name='NO_SHARED_LIBS_IN_PROC_MAPS' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='RangeValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='404' column='1' id='type-id-246'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -4492,7 +4392,6 @@ 
     <typedef-decl name='MallocHook_MmapHook' type-id='type-id-366' filepath='./src/gperftools/malloc_hook_c.h' line='99' column='1' id='type-id-367'/>
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-368' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-369'/>
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-370'>
-
         <member-type access='private'>
           <typedef-decl name='void_function' type-id='type-id-153' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-371'/>
         </member-type>
@@ -4917,7 +4816,6 @@ 
     <qualified-type-def type-id='type-id-120' const='yes' id='type-id-712'/>
     <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
     <namespace-decl name='std'>
-
       <function-decl name='swap&lt;AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-376'/>
         <parameter type-id='type-id-376'/>
@@ -5202,7 +5100,6 @@ 
         <return type-id='type-id-462'/>
       </function-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-555'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-665'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-279'/>
@@ -5219,7 +5116,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-559'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-719'/>
@@ -5320,7 +5216,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-719'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -6407,7 +6302,6 @@ 
         <return type-id='type-id-701'/>
       </function-decl>
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-543'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-653'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-134'/>
@@ -6903,11 +6797,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-531'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-650' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-730'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-533' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-731'/>
           </member-type>
@@ -7048,7 +6940,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-478'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-630'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-288'/>
@@ -7827,7 +7718,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-470'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-622'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-304'/>
@@ -8583,7 +8473,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-466'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-618'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-320'/>
@@ -9273,7 +9162,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-474'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-626'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-336'/>
@@ -9976,7 +9864,6 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, const long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-752'/>
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-549'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
@@ -10106,7 +9993,6 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-754'/>
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-546'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-656'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-552'/>
@@ -10200,11 +10086,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-755'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-66' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-565'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-569'/>
           </member-type>
@@ -12690,7 +12574,6 @@ 
       <class-decl name='__normal_iterator&lt;void (* const*)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-759'/>
       <class-decl name='__normal_iterator&lt;void* const*, std::vector&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-766'/>
     </namespace-decl>
-
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
         <class-decl name='HookList&lt;void (*)(const void*, const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-403'>
@@ -12804,7 +12687,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
     </namespace-decl>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <var-decl name='FLAGS_heap_check_pointer_source_alignment' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead41FLAGS_heap_check_pointer_source_alignmentE' visibility='default' filepath='src/heap-checker.cc' line='190' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead41FLAGS_heap_check_pointer_source_alignmentE'/>
@@ -12844,7 +12726,6 @@ 
       <var-decl name='FLAGS_heap_check_max_pointer_offset' type-id='type-id-76' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead35FLAGS_heap_check_max_pointer_offsetE' visibility='default' filepath='src/heap-checker.cc' line='204' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead35FLAGS_heap_check_max_pointer_offsetE'/>
       <var-decl name='FLAGS_noheap_check_max_pointer_offset' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE' visibility='default' filepath='src/heap-checker.cc' line='209' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE'/>
     </namespace-decl>
-
     <namespace-decl name='tcmalloc'>
       <namespace-decl name='commandlineflags'>
         <function-decl name='StringToInt' filepath='./src/base/commandlineflags.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13004,7 +12885,6 @@ 
     <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-274'/>
     <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-277'/>
     <namespace-decl name='std'>
-
       <function-decl name='__equal_aux&lt;const void* const*, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-150'/>
         <parameter type-id='type-id-150'/>
@@ -13281,7 +13161,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
       <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-805'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-843'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-824'/>
@@ -14616,8 +14495,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <var-decl name='FLAGS_heap_check_max_leaks' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead26FLAGS_heap_check_max_leaksE' visibility='default' filepath='src/heap-profile-table.cc' line='87' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead26FLAGS_heap_check_max_leaksE'/>
       <var-decl name='FLAGS_noheap_check_max_leaks' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead28FLAGS_noheap_check_max_leaksE' visibility='default' filepath='src/heap-profile-table.cc' line='89' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead28FLAGS_noheap_check_max_leaksE'/>
@@ -14629,7 +14506,6 @@ 
         <parameter type-id='type-id-795'/>
         <return type-id='type-id-1'/>
       </function-decl>
-
     </namespace-decl>
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <var-decl name='FLAGS_cleanup_old_heap_profiles' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead31FLAGS_cleanup_old_heap_profilesE' visibility='default' filepath='src/heap-profile-table.cc' line='83' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead31FLAGS_cleanup_old_heap_profilesE'/>
@@ -14687,11 +14563,6 @@ 
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-883'/>
-
-
-
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <var-decl name='FLAGS_heap_profile_allocation_interval' type-id='type-id-76' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead38FLAGS_heap_profile_allocation_intervalE' visibility='default' filepath='src/heap-profiler.cc' line='95' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead38FLAGS_heap_profile_allocation_intervalE'/>
       <var-decl name='FLAGS_noheap_profile_allocation_interval' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead40FLAGS_noheap_profile_allocation_intervalE' visibility='default' filepath='src/heap-profiler.cc' line='99' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead40FLAGS_noheap_profile_allocation_intervalE'/>
@@ -14710,8 +14581,6 @@ 
       <var-decl name='FLAGS_only_mmap_profile' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead23FLAGS_only_mmap_profileE' visibility='default' filepath='src/heap-profiler.cc' line='122' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead23FLAGS_only_mmap_profileE'/>
       <var-decl name='FLAGS_noonly_mmap_profile' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE' visibility='default' filepath='src/heap-profiler.cc' line='125' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE'/>
     </namespace-decl>
-
-
     <function-decl name='HeapProfilerDump' mangled-name='HeapProfilerDump' filepath='src/heap-profiler.cc' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='HeapProfilerDump'>
       <parameter type-id='type-id-52' name='reason' filepath='src/heap-profiler.cc' line='533' column='1'/>
       <return type-id='type-id-56'/>
@@ -14731,10 +14600,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='1600' id='type-id-884'>
       <subrange length='200' type-id='type-id-5' id='type-id-885'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-886' const='yes' id='type-id-887'/>
     <reference-type-def kind='lvalue' type-id='type-id-887' size-in-bits='64' id='type-id-888'/>
@@ -14780,11 +14647,6 @@ 
       </class-decl>
       <var-decl name='log_message_writer' type-id='type-id-892' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
     </namespace-decl>
-
-
-
-
-
     <function-type size-in-bits='64' id='type-id-891'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-1'/>
@@ -14800,12 +14662,6 @@ 
     </enum-decl>
     <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-259'/>
     <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-
-
-
-
-
-
     <function-decl name='MallocExtension_GetOwnership' mangled-name='MallocExtension_GetOwnership' filepath='src/malloc_extension.cc' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_GetOwnership'>
       <parameter type-id='type-id-53' name='p' filepath='src/malloc_extension.cc' line='375' column='1'/>
       <return type-id='type-id-893'/>
@@ -14868,7 +14724,6 @@ 
       <return type-id='type-id-1'/>
     </function-decl>
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
             <underlying-type type-id='type-id-133'/>
@@ -14877,7 +14732,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -14894,7 +14748,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
         </member-type>
@@ -15131,7 +14984,6 @@ 
     <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-944'/>
     <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
     <namespace-decl name='std'>
-
       <function-decl name='__copy_move_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-120'/>
         <parameter type-id='type-id-120'/>
@@ -15151,8 +15003,6 @@ 
         <return type-id='type-id-120'/>
       </function-decl>
     </namespace-decl>
-
-
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
         <class-decl name='HookList&lt;void (*)(const void*, size_t, int, int, int, off_t)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/malloc_hook-inl.h' line='59' column='1' id='type-id-921'>
@@ -15453,8 +15303,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
-
     <function-decl name='mmap' mangled-name='mmap' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap'>
       <parameter type-id='type-id-53' name='start' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1'/>
       <parameter type-id='type-id-57' name='length' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1'/>
@@ -15655,10 +15503,6 @@ 
   <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
-
-
-
-
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <parameter type-id='type-id-956' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
       <parameter type-id='type-id-153' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
@@ -15734,12 +15578,6 @@ 
       </member-function>
     </class-decl>
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
-
-
-
-
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead'>
       <var-decl name='FLAGS_memfs_malloc_path' type-id='type-id-783' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_memfs_malloc_pathE' visibility='default' filepath='src/memfs_malloc.cc' line='70' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_memfs_malloc_pathE'/>
       <var-decl name='FLAGS_nomemfs_malloc_path' type-id='type-id-66' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead25FLAGS_nomemfs_malloc_pathE' visibility='default' filepath='src/memfs_malloc.cc' line='73' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead25FLAGS_nomemfs_malloc_pathE'/>
@@ -15756,7 +15594,6 @@ 
       <var-decl name='FLAGS_memfs_malloc_map_private' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead30FLAGS_memfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='85' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead30FLAGS_memfs_malloc_map_privateE'/>
       <var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
     </namespace-decl>
-
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
         <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15785,13 +15622,10 @@ 
   <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-190' size-in-bits='8960' id='type-id-179'>
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-53' size-in-bits='40960' id='type-id-180'>
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
       <member-function access='private'>
@@ -16015,7 +15849,6 @@ 
     <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-997'/>
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-184'/>
     <namespace-decl name='std'>
-
       <function-decl name='__equal_aux&lt;const void**, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-120'/>
         <parameter type-id='type-id-120'/>
@@ -16253,7 +16086,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-979'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-990'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-961'/>
@@ -16891,10 +16723,7 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <namespace-decl name='base'>
-
       <namespace-decl name='subtle'>
         <function-decl name='NoBarrier_Load' filepath='./src/base/atomicops-internals-x86.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-81'/>
@@ -16902,17 +16731,12 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
     <function-type size-in-bits='64' id='type-id-998'>
       <parameter type-id='type-id-160'/>
       <return type-id='type-id-56'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <namespace-decl name='tcmalloc'>
       <namespace-decl name='commandlineflags'>
         <function-decl name='StringToDouble' filepath='src/base/commandlineflags.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16948,7 +16772,6 @@ 
     <typedef-decl name='timer_t' type-id='type-id-1010' filepath='/usr/include/time.h' line='104' column='1' id='type-id-1008'/>
     <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1010'/>
     <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1011'>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1012'>
             <underlying-type type-id='type-id-133'/>
@@ -16958,11 +16781,9 @@ 
             <enumerator name='TIMERS_SEPARATE' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='CallbackList' type-id='type-id-1014' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1013'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='CallbackIterator' type-id='type-id-1016' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1015'/>
         </member-type>
@@ -17190,9 +17011,7 @@ 
     <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1073'/>
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1009'/>
     <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1005'/>
-
     <namespace-decl name='std'>
-
       <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1016'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-1068' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='179' column='1'/>
@@ -17641,7 +17460,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1040'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1060'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
@@ -17942,9 +17760,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <function-decl name='ProfileHandlerGetState' mangled-name='ProfileHandlerGetState' filepath='src/profile-handler.cc' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerGetState'>
       <parameter type-id='type-id-1020' name='state' filepath='src/profile-handler.cc' line='658' column='1'/>
       <return type-id='type-id-56'/>
@@ -17973,32 +17788,21 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-1078' size-in-bits='4096' id='type-id-1079'>
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1081' size-in-bits='16896' id='type-id-1082'>
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1083'>
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1085'>
       <subrange length='28' type-id='type-id-5' id='type-id-1086'/>
-
     </array-type-def>
     <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1087'>
-
         <member-type access='private'>
           <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1088'>
             <data-member access='private' layout-offset-in-bits='0'>
@@ -18025,7 +17829,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1091'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -18042,10 +17845,8 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1081'>
-
               <member-type access='private'>
                 <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1078'/>
               </member-type>
@@ -18060,7 +17861,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1093'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -18213,7 +18013,6 @@ 
     </class-decl>
     <typedef-decl name='time_t' type-id='type-id-1103' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1092'/>
     <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1104'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='59' column='1' id='type-id-1105'>
             <member-type access='private'>
@@ -18466,16 +18265,10 @@ 
     <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1118'/>
     <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1116'/>
     <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1021'/>
-
-
-
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <var-decl name='FLAGS_cpu_profiler_unittest' type-id='type-id-55' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead27FLAGS_cpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='74' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead27FLAGS_cpu_profiler_unittestE'/>
       <var-decl name='FLAGS_nocpu_profiler_unittest' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='78' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE'/>
     </namespace-decl>
-
     <function-decl name='ProfilerEnable' mangled-name='ProfilerEnable' filepath='src/profiler.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerEnable'>
       <return type-id='type-id-56'/>
     </function-decl>
@@ -18572,24 +18365,15 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <namespace-decl name='std'>
-
       <function-decl name='min&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1135'/>
         <parameter type-id='type-id-1135'/>
         <return type-id='type-id-1135'/>
       </function-decl>
     </namespace-decl>
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <var-decl name='FLAGS_tcmalloc_sample_parameter' type-id='type-id-76' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead31FLAGS_tcmalloc_sample_parameterE' visibility='default' filepath='src/sampler.cc' line='52' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead31FLAGS_tcmalloc_sample_parameterE'/>
       <var-decl name='FLAGS_notcmalloc_sample_parameter' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE' visibility='default' filepath='src/sampler.cc' line='55' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE'/>
@@ -18624,10 +18408,6 @@ 
         <return type-id='type-id-1136'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
@@ -18643,7 +18423,6 @@ 
     <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
     <namespace-decl name='tcmalloc'>
       <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1145'>
-
           <member-type access='private'>
             <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1148'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -18723,19 +18502,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <function-decl name='GetStackFrames' mangled-name='_Z14GetStackFramesPPvPiii' filepath='src/stacktrace.cc' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14GetStackFramesPPvPiii'>
       <parameter type-id='type-id-120' name='result' filepath='src/stacktrace.cc' line='220' column='1'/>
       <parameter type-id='type-id-897' name='sizes' filepath='src/stacktrace.cc' line='220' column='1'/>
@@ -18766,16 +18534,9 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1154'>
-
         <member-type access='private'>
           <typedef-decl name='SymbolMap' type-id='type-id-1156' filepath='src/symbolize.h' line='72' column='1' id='type-id-1155'/>
         </member-type>
@@ -18877,9 +18638,7 @@ 
     <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1221'/>
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
     <namespace-decl name='std'>
-
       <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1169'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1207'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1188'/>
@@ -20124,9 +19883,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='tcmalloc'>
       <function-decl name='DumpProcSelfMaps' mangled-name='_ZN8tcmalloc16DumpProcSelfMapsEi' filepath='src/base/sysinfo.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc16DumpProcSelfMapsEi'>
         <parameter type-id='type-id-67'/>
@@ -20139,18 +19895,14 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='128' id='type-id-1231'>
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1233'>
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1234'>
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1235'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
@@ -20249,12 +20001,6 @@ 
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
     <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1238'/>
-
-
-
-
-
-
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <var-decl name='FLAGS_malloc_devmem_start' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead25FLAGS_malloc_devmem_startE' visibility='default' filepath='src/system-alloc.cc' line='130' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead25FLAGS_malloc_devmem_startE'/>
       <var-decl name='FLAGS_nomalloc_devmem_start' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead27FLAGS_nomalloc_devmem_startE' visibility='default' filepath='src/system-alloc.cc' line='133' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead27FLAGS_nomalloc_devmem_startE'/>
@@ -20296,39 +20042,22 @@ 
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-57' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-781' size-in-bits='512' id='type-id-782'>
       <subrange length='8' type-id='type-id-5' id='type-id-1243'/>
-
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-55'/>
     <type-decl name='char' size-in-bits='8' id='type-id-66'/>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1244'>
       <subrange length='1' type-id='type-id-5' id='type-id-1245'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1246'>
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='384' id='type-id-168'>
       <subrange length='48' type-id='type-id-5' id='type-id-1247'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1248'>
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1249'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -20347,17 +20076,14 @@ 
     <type-decl name='double' size-in-bits='64' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1250'>
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <type-decl name='float' size-in-bits='32' id='type-id-1251'/>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1252'>
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1254'>
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <type-decl name='long double' size-in-bits='128' id='type-id-1256'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-285'/>
@@ -20366,29 +20092,23 @@ 
     <type-decl name='signed char' size-in-bits='8' id='type-id-1259'/>
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1260'>
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='8192' id='type-id-1262'>
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1263' size-in-bits='856064' id='type-id-1264'>
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1265' size-in-bits='98304' id='type-id-1266'>
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='16896' id='type-id-1268'>
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-133'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1269'>
       <subrange length='2169' type-id='type-id-5' id='type-id-1270'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-1123'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-5'/>
@@ -20396,11 +20116,9 @@ 
     <type-decl name='void' id='type-id-56'/>
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1271'>
       <subrange length='31' type-id='type-id-5' id='type-id-1272'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1273' size-in-bits='4194304' id='type-id-1274'>
       <subrange length='65536' type-id='type-id-5' id='type-id-1275'/>
-
     </array-type-def>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-1276'/>
     <typedef-decl name='size_t' type-id='type-id-5' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-57'/>
@@ -20498,21 +20216,18 @@ 
       </data-member>
     </class-decl>
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-176'>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1287'>
             <underlying-type type-id='type-id-133'/>
             <enumerator name='kSpinLockSleeper' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1288'>
             <underlying-type type-id='type-id-133'/>
             <enumerator name='kSpinLockFree' value='0'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1289'>
             <underlying-type type-id='type-id-133'/>
@@ -20835,7 +20550,6 @@ 
     <typedef-decl name='__off64_t' type-id='type-id-285' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-951'/>
     <typedef-decl name='mbstate_t' type-id='type-id-1309' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1310'/>
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-1309'>
-
         <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-1311'>
             <data-member access='private'>
@@ -20992,43 +20706,33 @@ 
       </member-function>
     </class-decl>
     <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1317'>
-
         <member-type access='private'>
           <typedef-decl name='PreMmapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1318'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='MmapReplacement' type-id='type-id-907' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1319'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='MunmapReplacement' type-id='type-id-909' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1320'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='MunmapHook' type-id='type-id-910' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1321'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='MremapHook' type-id='type-id-912' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1322'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='PreSbrkHook' type-id='type-id-914' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1323'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1324'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1325'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1326'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1327'/>
         </member-type>
@@ -21375,7 +21079,6 @@ 
     <typedef-decl name='intptr_t' type-id='type-id-285' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-73'/>
     <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1331'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
-
         <member-type access='private'>
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1332'/>
         </member-type>
@@ -21729,7 +21432,6 @@ 
     <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1484'/>
     <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
     <namespace-decl name='std'>
-
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1340'/>
         <parameter type-id='type-id-1340'/>
@@ -21842,7 +21544,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1380'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1430'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1383'/>
@@ -22496,7 +22197,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-726'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-562'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1496'/>
@@ -22597,7 +22297,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-1439'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1386'/>
@@ -22614,7 +22313,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-1496'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -23681,7 +23379,6 @@ 
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/new' line='67' column='1' is-declaration-only='yes' id='type-id-1395'/>
     </namespace-decl>
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
             <underlying-type type-id='type-id-133'/>
@@ -23690,7 +23387,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -23707,7 +23403,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
         </member-type>
@@ -24171,7 +23866,6 @@ 
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1497'/>
       <class-decl name='__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1498'/>
     </namespace-decl>
-
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-1'/>
@@ -24798,7 +24492,6 @@ 
         <enumerator name='LINKER_INITIALIZED' value='0'/>
       </enum-decl>
       <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1351'>
-
           <member-type access='public'>
             <enum-decl name='Type' filepath='./src/gperftools/malloc_extension.h' line='400' column='1' id='type-id-1501'>
               <underlying-type type-id='type-id-133'/>
@@ -24834,7 +24527,6 @@ 
         <enumerator name='kCrashWithStats' value='2'/>
       </enum-decl>
       <class-decl name='LogItem' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='70' column='1' id='type-id-886'>
-
           <member-type access='private'>
             <enum-decl name='Tag' filepath='src/internal_logging.h' line='83' column='1' id='type-id-1503'>
               <underlying-type type-id='type-id-133'/>
@@ -24845,7 +24537,6 @@ 
               <enumerator name='kEnd' value='4'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/internal_logging.h' line='91' column='1' id='type-id-1504'>
               <data-member access='private'>
@@ -25150,7 +24841,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='CentralFreeList' size-in-bits='9344' visibility='default' filepath='src/central_freelist.h' line='50' column='1' id='type-id-1446'>
-
           <member-type access='private'>
             <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1261'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25482,7 +25172,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='PageHeap' size-in-bits='4293888' visibility='default' filepath='src/page_heap.h' line='104' column='1' id='type-id-1403'>
-
           <member-type access='private'>
             <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1330'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25505,7 +25194,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='SmallSpanStats' size-in-bits='16384' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='155' column='1' id='type-id-1453'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25516,7 +25204,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='LargeSpanStats' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='164' column='1' id='type-id-1451'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25530,7 +25217,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1265'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25541,11 +25227,9 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='PageMap' type-id='type-id-1278' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='PageMapCache' type-id='type-id-1299' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
           </member-type>
@@ -25816,7 +25500,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ThreadCache' size-in-bits='17408' visibility='default' filepath='src/thread_cache.h' line='66' column='1' id='type-id-1415'>
-
           <member-type access='private'>
             <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1267'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -25929,7 +25612,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='ThreadLocalData' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/thread_cache.h' line='262' column='1' id='type-id-1509'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -25940,7 +25622,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/thread_cache.h' line='69' column='1' id='type-id-1510'>
               <underlying-type type-id='type-id-133'/>
@@ -26317,8 +25998,6 @@ 
       <var-decl name='FLAGS_tcmalloc_large_alloc_report_threshold' type-id='type-id-76' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead43FLAGS_tcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='183' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead43FLAGS_tcmalloc_large_alloc_report_thresholdE'/>
       <var-decl name='FLAGS_notcmalloc_large_alloc_report_threshold' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='195' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE'/>
     </namespace-decl>
-
-
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
         <function-decl name='SysAllocator' filepath='./src/gperftools/malloc_extension.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26508,9 +26187,7 @@ 
       </function-decl>
       <var-decl name='threadcache_allocator' type-id='type-id-1412' mangled-name='_ZN8tcmalloc21threadcache_allocatorE' visibility='default' filepath='src/thread_cache.cc' line='67' column='1' elf-symbol-id='_ZN8tcmalloc21threadcache_allocatorE'/>
     </namespace-decl>
-
     <namespace-decl name='std'>
-
       <function-decl name='max&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1135'/>
         <parameter type-id='type-id-1135'/>
@@ -26522,7 +26199,5 @@ 
         <return type-id='type-id-113'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 46550792..0d98ce48 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -387,28 +387,19 @@ 
     <elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -427,7 +418,6 @@ 
     <type-decl name='double' size-in-bits='64' id='type-id-15'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-16'>
       <subrange length='3' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <type-decl name='float' size-in-bits='32' id='type-id-18'/>
     <type-decl name='int' size-in-bits='32' id='type-id-19'/>
@@ -626,10 +616,8 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkMultiProcessStream' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.h' line='35' column='1' id='type-id-51'>
-
         <member-type access='private'>
           <class-decl name='vtkInternals' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='23' column='1' id='type-id-52'>
-
               <member-type access='public'>
                 <enum-decl name='Types' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='28' column='1' id='type-id-53'>
                   <underlying-type type-id='type-id-25'/>
@@ -645,7 +633,6 @@ 
                   <enumerator name='stream_value' value='9'/>
                 </enum-decl>
               </member-type>
-
               <member-type access='public'>
                 <typedef-decl name='DataType' type-id='type-id-55' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='25' column='1' id='type-id-54'/>
               </member-type>
@@ -1044,7 +1031,6 @@ 
     <typedef-decl name='__FILE' type-id='type-id-31' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-93'/>
     <typedef-decl name='mbstate_t' type-id='type-id-94' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-95'/>
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-94'>
-
         <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-96'>
             <data-member access='private'>
@@ -1519,7 +1505,6 @@ 
     </class-decl>
     <class-decl name='vtkCommunicator' size-in-bits='576' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='45' column='1' id='type-id-116'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='private'>
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='65' column='1' id='type-id-118'>
             <underlying-type type-id='type-id-25'/>
@@ -1532,7 +1517,6 @@ 
             <enumerator name='BARRIER_TAG' value='16'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-119'>
             <underlying-type type-id='type-id-25'/>
@@ -3734,7 +3718,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-161'>
-
         <member-type access='protected'>
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-185'/>
         </member-type>
@@ -4065,9 +4048,7 @@ 
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-388'/>
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
     <namespace-decl name='std'>
-
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-354'>
-
           <member-type access='private'>
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-356'>
               <data-member access='private' static='yes'>
@@ -4180,7 +4161,6 @@ 
         </data-member>
       </class-decl>
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-390'>
-
           <member-type access='public'>
             <typedef-decl name='fmtflags' type-id='type-id-391' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-232'/>
           </member-type>
@@ -4211,7 +4191,6 @@ 
         <enumerator name='_S_ios_fmtflags_end' value='65536'/>
       </enum-decl>
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-260'>
-
           <member-type access='public'>
             <typedef-decl name='iostate' type-id='type-id-392' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-263'/>
           </member-type>
@@ -4263,11 +4242,9 @@ 
         <enumerator name='_S_ios_iostate_end' value='65536'/>
       </enum-decl>
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-240'>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-393' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-243'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-394' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-245'/>
           </member-type>
@@ -4474,7 +4451,6 @@ 
         <return type-id='type-id-28'/>
       </function-decl>
       <class-decl name='__miter_base&lt;const vtkCommunicator::ReduceVoidArray::VTK_TT*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' is-declaration-only='yes' id='type-id-399'>
-
           <member-type access='public'>
             <typedef-decl name='VTK_TT' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='1342' column='1' id='type-id-247'/>
           </member-type>
@@ -4668,7 +4644,6 @@ 
         <return type-id='type-id-392'/>
       </function-decl>
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-276'>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-400'/>
           </member-type>
@@ -4773,7 +4748,6 @@ 
       </function-decl>
       <typedef-decl name='ostream' type-id='type-id-340' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='130' column='1' id='type-id-358'/>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-265'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-349'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-402'/>
@@ -4874,7 +4848,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-347'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-251'/>
@@ -4891,7 +4864,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-402'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -6339,7 +6311,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-237'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-326'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
@@ -6491,7 +6462,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;long long int, std::allocator&lt;long long int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-234'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-323'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-254'/>
@@ -7177,11 +7147,9 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;long long int*, std::vector&lt;long long int, std::allocator&lt;long long int&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-442'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const long long int*, std::vector&lt;long long int, std::allocator&lt;long long int&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-443'/>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-444'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-269'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-19' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-273'/>
           </member-type>
@@ -8038,7 +8006,6 @@ 
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-23'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-98'/>
@@ -8185,7 +8152,6 @@ 
       <parameter type-id='type-id-190'/>
       <return type-id='type-id-19'/>
     </function-decl>
-
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-366'/>
       <return type-id='type-id-19'/>
@@ -8371,7 +8337,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-450'>
-
         <member-type access='private'>
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-302'/>
         </member-type>
@@ -8383,7 +8348,6 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkDataArrayTemplate&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-371'>
-
         <member-type access='private'>
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-451'>
             <underlying-type type-id='type-id-25'/>
@@ -8580,15 +8544,10 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-456' size-in-bits='64' id='type-id-455'/>
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-454'/>
     <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-457'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='public'>
           <enum-decl name='Errors' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='296' column='1' id='type-id-458'>
             <underlying-type type-id='type-id-25'/>
@@ -8597,7 +8556,6 @@ 
             <enumerator name='RMI_ARG_ERROR' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <enum-decl name='Consts' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='303' column='1' id='type-id-459'>
             <underlying-type type-id='type-id-25'/>
@@ -8605,7 +8563,6 @@ 
             <enumerator name='INVALID_SOURCE' value='-2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='309' column='1' id='type-id-460'>
             <underlying-type type-id='type-id-25'/>
@@ -8615,10 +8572,8 @@ 
             <enumerator name='XML_WRITER_DATA_INFO' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-461'>
-
               <member-type access='private'>
                 <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-462'>
                   <data-member access='private' layout-offset-in-bits='0'>
@@ -8632,7 +8587,6 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='RMICallbackMap' type-id='type-id-465' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='61' column='1' id='type-id-464'/>
               </member-type>
@@ -10413,10 +10367,6 @@ 
     <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-479'/>
     <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-481'/>
     <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-471'/>
-
-
-
-
     <function-type size-in-bits='64' id='type-id-485'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
@@ -10591,10 +10541,6 @@ 
     <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-492'/>
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-491'/>
     <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-490'/>
-
-
-
-
     <function-decl name='memchr' mangled-name='*memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-19'/>
@@ -10938,7 +10884,6 @@ 
     </class-decl>
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-468'/>
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-507'>
-
         <member-type access='protected'>
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-508'/>
         </member-type>
@@ -11595,7 +11540,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-841' size-in-bits='64' id='type-id-973'/>
     <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-974'/>
     <namespace-decl name='std'>
-
       <function-decl name='__fill_a&lt;std::_Bit_type*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-321'/>
         <parameter type-id='type-id-321'/>
@@ -11610,15 +11554,12 @@ 
       </function-decl>
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='186' column='1' id='type-id-630'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-638' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='187' column='1' id='type-id-975'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-853' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='188' column='1' id='type-id-976'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-630' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='189' column='1' id='type-id-849'/>
           </member-type>
@@ -12319,7 +12260,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-666'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-877'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-705'/>
@@ -12851,7 +12791,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-669'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-880'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-711'/>
@@ -13383,7 +13322,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-663'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-874'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
@@ -13987,19 +13925,15 @@ 
       </function-decl>
       <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='268' column='1' id='type-id-627'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='269' column='1' id='type-id-1006'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='270' column='1' id='type-id-1007'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-626' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='271' column='1' id='type-id-1008'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-627' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='272' column='1' id='type-id-846'/>
           </member-type>
@@ -15011,7 +14945,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='375' column='1' id='type-id-643'>
-
           <member-type access='public'>
             <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='381' column='1' id='type-id-855'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-678'/>
@@ -15380,7 +15313,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-660'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-871'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-693'/>
@@ -15506,7 +15438,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-657'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-868'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-675'/>
@@ -15700,7 +15631,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-646'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-858'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-681'/>
@@ -20121,8 +20051,6 @@ 
       </class-decl>
       <class-decl name='__normal_iterator&lt;const int*, std::vector&lt;int, std::allocator&lt;int&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1035'/>
     </namespace-decl>
-
-
     <class-decl name='vtkOutputWindow' visibility='default' is-declaration-only='yes' id='type-id-937'/>
     <function-type size-in-bits='64' id='type-id-928'>
       <parameter type-id='type-id-471'/>
@@ -20133,7 +20061,6 @@ 
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='256' id='type-id-403'>
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-448'/>
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-445'/>
@@ -20173,7 +20100,6 @@ 
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-429'/>
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-430'/>
     <namespace-decl name='std'>
-
       <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-417'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_cur' type-id='type-id-58' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
@@ -21229,14 +21155,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-1052'>
-
           <member-type access='protected'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-1082'>
               <underlying-type type-id='type-id-25'/>
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-1070'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
@@ -21554,24 +21478,17 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-500' const='yes' id='type-id-1091'/>
     <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-502'/>
     <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-501'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-503' const='yes' id='type-id-1092'/>
     <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-505'/>
     <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-504'/>
     <namespace-decl name='std'>
-
       <function-decl name='__copy_move_a&lt;false, int*, int*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-76'/>
         <parameter type-id='type-id-76'/>
@@ -21599,14 +21516,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <class-decl name='vtkSocketCommunicator' size-in-bits='1088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='55' column='1' id='type-id-1094'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-116'/>
-
         <member-type access='private'>
           <enum-decl name='ErrorIds' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='259' column='1' id='type-id-1095'>
             <underlying-type type-id='type-id-25'/>
@@ -21615,14 +21528,11 @@ 
             <enumerator name='SwapNotSet' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <class-decl name='vtkMessageBuffer' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='37' column='1' id='type-id-1096'>
-
               <member-type access='private'>
                 <typedef-decl name='BufferType' type-id='type-id-1098' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='41' column='1' id='type-id-1097'/>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='MessageType' type-id='type-id-1100' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='39' column='1' id='type-id-1099'/>
               </member-type>
@@ -22194,15 +22104,12 @@ 
     </class-decl>
     <class-decl name='vtkStdString' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='40' column='1' id='type-id-1110'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-265'/>
-
         <member-type access='private'>
           <typedef-decl name='StdString' type-id='type-id-280' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='42' column='1' id='type-id-1111'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='value_type' type-id='type-id-269' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='43' column='1' id='type-id-1112'/>
         </member-type>
-
         <member-type access='private'>
           <typedef-decl name='size_type' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='47' column='1' id='type-id-1113'/>
         </member-type>
@@ -22474,7 +22381,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1102'/>
     <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1114'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator&amp;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-392'/>
         <parameter type-id='type-id-392'/>
@@ -23217,7 +23123,6 @@ 
         <return type-id='type-id-76'/>
       </function-decl>
       <class-decl name='_Rb_tree&lt;int, std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;, std::less&lt;int&gt;, std::allocator&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1252'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1210'/>
@@ -23816,11 +23721,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-1198'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1260' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-1296'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-1200' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-1297'/>
           </member-type>
@@ -24732,7 +24635,6 @@ 
       </class-decl>
       <typedef-decl name='ofstream' type-id='type-id-1272' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='138' column='1' id='type-id-1278'/>
       <class-decl name='_List_base&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1165'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1242'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1207'/>
@@ -24949,7 +24851,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1204'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1263'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-251'/>
@@ -25583,8 +25484,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <class-decl name='vtkSocket' visibility='default' is-declaration-only='yes' id='type-id-1289'>
       <member-function access='private'>
         <function-decl name='GetConnected' mangled-name='_ZN9vtkSocket12GetConnectedEv' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/System/vtkSocket.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25778,10 +25677,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-1316'/>
     <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-1315'/>
     <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1314'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <class-decl name='vtkSubCommunicator' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.h' line='52' column='1' id='type-id-1318'>
@@ -25906,15 +25801,10 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1322' size-in-bits='64' id='type-id-1321'/>
     <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1320'/>
     <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1323'>
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <class-decl name='vtkSubGroup' size-in-bits='3520' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.h' line='49' column='1' id='type-id-1324'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
@@ -26307,7 +26197,6 @@ 
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1327'/>
     <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
     <namespace-decl name='std'>
-
       <function-decl name='__unguarded_linear_insert&lt;int*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-76'/>
         <parameter type-id='type-id-19'/>
@@ -26417,8 +26306,5 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 203aa713..bedb9a14 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -450,7 +450,6 @@ 
     <elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.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'>
-
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
@@ -463,30 +462,19 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.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'>
-
-
-
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-3'/>
     <type-decl name='char' size-in-bits='8' id='type-id-4'/>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='1024' id='type-id-5'>
       <subrange length='128' type-id='type-id-6' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='8' id='type-id-8'>
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='160' id='type-id-10'>
       <subrange length='20' type-id='type-id-6' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='32' id='type-id-12'>
       <subrange length='4' type-id='type-id-6' id='type-id-13'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-14'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -504,23 +492,19 @@ 
     </class-decl>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-17'>
       <subrange length='60' type-id='type-id-6' id='type-id-18'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='384' id='type-id-19'>
       <subrange length='12' type-id='type-id-6' id='type-id-20'/>
-
     </array-type-def>
     <type-decl name='long int' size-in-bits='64' id='type-id-21'/>
     <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='192' id='type-id-22'>
       <subrange length='3' type-id='type-id-6' id='type-id-23'/>
-
     </array-type-def>
     <type-decl name='signed char' size-in-bits='8' id='type-id-24'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-6'/>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='192' id='type-id-25'>
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-26'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-27'/>
@@ -980,7 +964,6 @@ 
     <typedef-decl name='location_t' type-id='type-id-99' filepath='../.././gcc/input.h' line='44' column='1' id='type-id-74'/>
     <typedef-decl name='source_location' type-id='type-id-15' filepath='../.././gcc/../libcpp/include/line-map.h' line='51' column='1' id='type-id-99'/>
     <class-decl name='line_map' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='204' column='1' id='type-id-100'>
-
         <member-type access='public'>
           <union-decl name='map_u' size-in-bits='256' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='210' column='1' id='type-id-101'>
             <data-member access='private'>
@@ -1119,7 +1102,6 @@ 
     <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-16'/>
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-143'/>
-
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-2'/>
@@ -1654,7 +1636,6 @@ 
     <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-157'/>
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-151'/>
     <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-150'/>
-
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-124'/>
@@ -2605,7 +2586,6 @@ 
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-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-160' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <parameter type-id='type-id-31' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
@@ -2674,7 +2654,6 @@ 
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-164'/>
-
     <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-30'/>
     </function-decl>
@@ -2698,7 +2677,6 @@ 
     <qualified-type-def type-id='type-id-165' const='yes' id='type-id-167'/>
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-169'/>
-
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-31'/>
@@ -2758,7 +2736,6 @@ 
     <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-172'/>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-173'/>
     <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <parameter type-id='type-id-38' name='pp' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
       <parameter type-id='type-id-2' name='length' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
@@ -2987,7 +2964,6 @@ 
     <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-200'/>
     <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-195'/>
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-198'/>
-
     <var-decl name='symbol_stack_obstack' type-id='type-id-57' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <var-decl name='symbol_stack' type-id='type-id-178' 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-57' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
@@ -3073,7 +3049,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.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'>
-
     <function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-2'/>
@@ -3173,20 +3148,14 @@ 
     </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-121' size-in-bits='248' id='type-id-209'>
       <subrange length='31' type-id='type-id-6' id='type-id-210'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='48' id='type-id-211'>
       <subrange length='6' type-id='type-id-6' id='type-id-212'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='56' id='type-id-213'>
       <subrange length='7' type-id='type-id-6' id='type-id-214'/>
-
     </array-type-def>
     <var-decl name='version_string' type-id='type-id-211' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
     <var-decl name='pkgversion_string' type-id='type-id-213' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
@@ -3571,10 +3540,8 @@ 
     </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'>
-
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-251'>
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <typedef-decl name='ssize_t' type-id='type-id-253' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-254'/>
     <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-253'/>
@@ -3859,7 +3826,6 @@ 
   <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'>
     <array-type-def dimensions='1' type-id='type-id-271' size-in-bits='2048' id='type-id-272'>
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
@@ -4041,10 +4007,8 @@ 
   <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'>
     <array-type-def dimensions='1' type-id='type-id-288' size-in-bits='192' id='type-id-289'>
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-288'>
-
         <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-290'>
             <data-member access='private'>
@@ -4125,7 +4089,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-297'>
-
         <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-301'>
             <data-member access='private'>
@@ -4466,7 +4429,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-306'>
-
         <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-307'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -4873,7 +4835,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-228'>
-
         <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-336'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -5077,7 +5038,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-279'>
-
         <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-339'>
             <member-type access='private'>
@@ -5108,7 +5068,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-343'>
             <data-member access='private'>
@@ -6080,15 +6039,11 @@ 
     <var-decl name='libiberty_concat_ptr' type-id='type-id-50' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </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'>
-
-
     <array-type-def dimensions='1' type-id='type-id-418' size-in-bits='8448' id='type-id-419'>
       <subrange length='33' type-id='type-id-6' id='type-id-420'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='11136' id='type-id-422'>
       <subrange length='58' type-id='type-id-6' id='type-id-423'/>
-
     </array-type-def>
     <type-decl name='short int' size-in-bits='16' id='type-id-424'/>
     <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-425'>
@@ -6498,10 +6453,8 @@ 
     </function-type>
   </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'>
-
     <array-type-def dimensions='1' type-id='type-id-456' size-in-bits='2112' id='type-id-457'>
       <subrange length='11' type-id='type-id-6' id='type-id-458'/>
-
     </array-type-def>
     <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-459'>
       <underlying-type type-id='type-id-26'/>
@@ -6785,10 +6738,8 @@ 
     </function-decl>
   </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'>
-
     <array-type-def dimensions='1' type-id='type-id-464' size-in-bits='64' id='type-id-465'>
       <subrange length='2' type-id='type-id-6' id='type-id-466'/>
-
     </array-type-def>
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -7230,7 +7181,6 @@ 
   <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-504' size-in-bits='4096' id='type-id-505'>
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-29' const='yes' id='type-id-504'/>
     <var-decl name='_sch_istable' type-id='type-id-505' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
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 438d712f..a24189c8 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -3673,7 +3673,6 @@ 
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/array_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__array_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='219' column='1' id='type-id-1'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-function access='private' constructor='yes'>
@@ -3706,10 +3705,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/atexit_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-7' const='yes' id='type-id-8'/>
@@ -3890,10 +3887,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-37'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='385' column='1' id='type-id-24'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
-
           <member-type access='private'>
             <enum-decl name='__sub_kind' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='399' column='1' id='type-id-38'>
               <underlying-type type-id='type-id-39'/>
@@ -3907,7 +3902,6 @@ 
               <enumerator name='__contained_public' value='6'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='__dyncast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='148' column='1' id='type-id-26'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -3948,7 +3942,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='__upcast_result' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/tinfo.h' line='132' column='1' id='type-id-29'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -4061,11 +4054,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
     <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-36'/>
       <return type-id='type-id-5'/>
@@ -4085,14 +4075,12 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <function-decl name='operator delete []' mangled-name='_ZdaPv' filepath='../../.././libstdc++-v3/libsupc++/del_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPv@@GLIBCXX_3.4'>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <function-decl name='operator delete []' mangled-name='_ZdaPvRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-36' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
       <parameter type-id='type-id-46'/>
@@ -4101,7 +4089,6 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
-
       <function-decl name='__dynamic_cast' mangled-name='__dynamic_cast' filepath='../../.././libstdc++-v3/libsupc++/dyncast.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_cast@@CXXABI_1.3'>
         <parameter type-id='type-id-36'/>
         <parameter type-id='type-id-33'/>
@@ -4110,7 +4097,6 @@ 
         <return type-id='type-id-36'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <class-decl name='_Unwind_Exception' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='85' column='1' id='type-id-47'>
@@ -4241,7 +4227,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__scoped_lock' 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/ext/concurrence.h' line='293' column='1' id='type-id-64'>
-
           <member-type access='private'>
             <typedef-decl name='__mutex_type' type-id='type-id-61' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='296' column='1' id='type-id-69'/>
           </member-type>
@@ -4442,7 +4427,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-92'/>
       <return type-id='type-id-36'/>
@@ -4458,12 +4442,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_bad_cast' mangled-name='__cxa_bad_cast' filepath='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_bad_cast@@CXXABI_1.3'>
         <return type-id='type-id-5'/>
@@ -4474,8 +4454,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__terminate' mangled-name='_ZN10__cxxabiv111__terminateEPFvvE' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-91'/>
@@ -4494,7 +4472,6 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-decl>
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_get_exception_ptr' mangled-name='__cxa_get_exception_ptr' filepath='../../.././libstdc++-v3/libsupc++/eh_catch.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_get_exception_ptr@@CXXABI_1.3.1'>
         <parameter type-id='type-id-36'/>
@@ -4631,10 +4608,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_globals.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_personality.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <typedef-decl name='_Unwind_Action' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='100' column='1' id='type-id-106'/>
@@ -4645,7 +4618,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__gxx_personality_v0' mangled-name='__gxx_personality_v0' filepath='../../.././libstdc++-v3/libsupc++/eh_personality.cc' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__gxx_personality_v0@@CXXABI_1.3'>
         <parameter type-id='type-id-6'/>
@@ -4715,7 +4687,6 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='__exception_ptr'>
         <class-decl name='exception_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/exception_ptr.h' line='75' column='1' id='type-id-110'>
-
             <member-type access='private'>
               <typedef-decl name='__safe_bool' type-id='type-id-119' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1' id='type-id-118'/>
             </member-type>
@@ -4886,7 +4857,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
     <function-decl name='_Unwind_RaiseException' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <return type-id='type-id-55'/>
@@ -4908,7 +4878,6 @@ 
     <namespace-decl name='__cxxabiv1'>
       <var-decl name='__terminate_handler' type-id='type-id-91' mangled-name='_ZN10__cxxabiv119__terminate_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' line='40' column='1'/>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
@@ -4921,11 +4890,8 @@ 
         <return type-id='type-id-90'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_throw' mangled-name='__cxa_throw' filepath='../../.././libstdc++-v3/libsupc++/eh_throw.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_throw@@CXXABI_1.3'>
         <parameter type-id='type-id-36'/>
@@ -4943,8 +4909,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_tm_cleanup' mangled-name='__cxa_tm_cleanup' filepath='../../.././libstdc++-v3/libsupc++/eh_tm.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_tm_cleanup@@CXXABI_TM_1'>
         <parameter type-id='type-id-36'/>
@@ -4960,18 +4924,15 @@ 
         <return type-id='type-id-85'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <var-decl name='__unexpected_handler' type-id='type-id-90' mangled-name='_ZN10__cxxabiv120__unexpected_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' line='28' column='1'/>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__enum_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='246' column='1' id='type-id-120'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-function access='private' constructor='yes'>
@@ -5004,14 +4965,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/function_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
     <qualified-type-def type-id='type-id-122' const='yes' id='type-id-124'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__function_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='230' column='1' id='type-id-122'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-function access='private' constructor='yes'>
@@ -5050,12 +5009,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/fundamental_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-127'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__fundamental_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='208' column='1' id='type-id-126'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
         <member-function access='private' constructor='yes'>
@@ -5088,14 +5045,11 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
-
     <namespace-decl name='__cxxabiv1'>
-
       <typedef-decl name='__guard' type-id='type-id-22' 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/cxxabi_tweaks.h' line='46' column='1' id='type-id-128'/>
       <function-decl name='__cxa_guard_acquire' mangled-name='__cxa_guard_acquire' filepath='../../.././libstdc++-v3/libsupc++/guard.cc' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_acquire@@CXXABI_1.3'>
         <parameter type-id='type-id-129'/>
@@ -5149,12 +5103,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <namespace-decl name='std'>
       <function-decl name='_Fnv_hash_bytes' mangled-name='_ZSt15_Fnv_hash_bytesPKvmm' filepath='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5'>
         <parameter type-id='type-id-36'/>
@@ -5171,7 +5121,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-132' size-in-bits='64' id='type-id-136'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-137'/>
     <namespace-decl name='std'>
-
       <class-decl name='nested_exception' 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/nested_exception.h' line='55' column='1' id='type-id-132'>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_ptr' type-id='type-id-110' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/nested_exception.h' line='57' column='1'/>
@@ -5243,15 +5192,12 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
     <function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libstdc++-v3/libsupc++/new_op.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm@@GLIBCXX_3.4'>
       <parameter type-id='type-id-94'/>
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <function-decl name='operator new' mangled-name='_ZnwmRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-94' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
       <parameter type-id='type-id-46'/>
@@ -5263,14 +5209,12 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <function-decl name='operator new []' mangled-name='_Znam' filepath='../../.././libstdc++-v3/libsupc++/new_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znam@@GLIBCXX_3.4'>
       <parameter type-id='type-id-94'/>
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
     <function-decl name='operator new []' mangled-name='_ZnamRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnamRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-94' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
       <parameter type-id='type-id-46'/>
@@ -5284,10 +5228,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-142' size-in-bits='64' id='type-id-143'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-144'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__pbase_type_info' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='257' column='1' id='type-id-139'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3'/>
-
           <member-type access='private'>
             <enum-decl name='__masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='273' column='1' id='type-id-145'>
               <underlying-type type-id='type-id-39'/>
@@ -5368,7 +5310,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-146' size-in-bits='64' id='type-id-147'/>
@@ -5377,7 +5318,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-149' size-in-bits='64' id='type-id-150'/>
     <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-151'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__pointer_to_member_type_info' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='324' column='1' id='type-id-146'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-139'/>
         <data-member access='private' layout-offset-in-bits='256'>
@@ -5439,14 +5379,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
     <qualified-type-def type-id='type-id-152' const='yes' id='type-id-154'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__pointer_type_info' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='299' column='1' id='type-id-152'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-139'/>
         <member-function access='private' constructor='yes'>
@@ -5496,7 +5434,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <typedef-decl name='ssize_t' type-id='type-id-156' filepath='/usr/include/unistd.h' line='221' column='1' id='type-id-157'/>
@@ -5509,7 +5446,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
     <function-decl name='write' filepath='/usr/include/unistd.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-36'/>
@@ -5524,7 +5460,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-161' size-in-bits='64' id='type-id-162'/>
     <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-163'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__si_class_type_info' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='478' column='1' id='type-id-158'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
         <data-member access='private' layout-offset-in-bits='128'>
@@ -5607,23 +5542,17 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-3' size-in-bits='64' id='type-id-164'/>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vec.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-166'/>
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-170'/>
     <namespace-decl name='__cxxabiv1'>
-
       <typedef-decl name='__cxa_cdtor_type' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='65' column='1' id='type-id-171'/>
       <function-decl name='__cxa_vec_cleanup' mangled-name='__cxa_vec_cleanup' filepath='../../.././libstdc++-v3/libsupc++/vec.cc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_vec_cleanup@@CXXABI_1.3'>
         <parameter type-id='type-id-36'/>
@@ -5708,7 +5637,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
     <function-type size-in-bits='64' id='type-id-165'>
       <parameter type-id='type-id-36'/>
       <parameter type-id='type-id-94'/>
@@ -5727,7 +5655,6 @@ 
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='128' id='type-id-173'>
       <subrange length='1' type-id='type-id-174' id='type-id-175'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
     <qualified-type-def type-id='type-id-172' const='yes' id='type-id-178'/>
@@ -5735,9 +5662,7 @@ 
     <qualified-type-def type-id='type-id-176' const='yes' id='type-id-180'/>
     <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
     <namespace-decl name='__cxxabiv1'>
-
       <class-decl name='__base_class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='351' column='1' id='type-id-172'>
-
           <member-type access='private'>
             <enum-decl name='__offset_flags_masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='357' column='1' id='type-id-182'>
               <underlying-type type-id='type-id-39'/>
@@ -5774,7 +5699,6 @@ 
       </class-decl>
       <class-decl name='__vmi_class_type_info' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='514' column='1' id='type-id-176'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
-
           <member-type access='private'>
             <enum-decl name='__flags_masks' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='533' column='1' id='type-id-183'>
               <underlying-type type-id='type-id-39'/>
@@ -5855,11 +5779,9 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-184'/>
-
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__verbose_terminate_handler' mangled-name='_ZN9__gnu_cxx27__verbose_terminate_handlerEv' filepath='../../.././libstdc++-v3/libsupc++/vterminate.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx27__verbose_terminate_handlerEv@@CXXABI_1.3'>
         <return type-id='type-id-5'/>
@@ -5911,10 +5833,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='320' id='type-id-187'>
       <subrange length='40' type-id='type-id-174' id='type-id-188'/>
-
     </array-type-def>
     <typedef-decl name='clock_t' type-id='type-id-189' filepath='/usr/include/time.h' line='60' column='1' id='type-id-190'/>
     <typedef-decl name='__clock_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='145' column='1' id='type-id-189'/>
@@ -5963,9 +5883,6 @@ 
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
     <qualified-type-def type-id='type-id-5' volatile='yes' id='type-id-214'/>
     <namespace-decl name='std'>
-
-
-
       <namespace-decl name='__atomic0'>
         <class-decl name='atomic_flag' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' line='64' column='1' id='type-id-217'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-219'/>
@@ -6025,7 +5942,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='lock_guard&lt;std::mutex&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='444' column='1' id='type-id-206'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='447' column='1' id='type-id-231'/>
           </member-type>
@@ -6071,7 +5987,6 @@ 
       </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/mutex' line='153' column='1' id='type-id-209'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-200'/>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-224' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='156' column='1' id='type-id-241'/>
           </member-type>
@@ -6128,7 +6043,6 @@ 
         </member-function>
       </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-200'>
-
           <member-type access='protected'>
             <typedef-decl name='__native_type' type-id='type-id-70' 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-223'/>
           </member-type>
@@ -6306,9 +6220,6 @@ 
       <parameter type-id='type-id-253'/>
       <return type-id='type-id-92'/>
     </function-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-194'>
       <member-type access='private'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='78' column='1' id='type-id-254'>
@@ -6430,15 +6341,11 @@ 
     <qualified-type-def type-id='type-id-333' const='yes' id='type-id-334'/>
     <reference-type-def kind='lvalue' type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
     <namespace-decl name='std'>
-
-
       <namespace-decl name='chrono'>
         <class-decl name='system_clock' size-in-bits='8' is-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='668' column='1' id='type-id-336'>
-
             <member-type access='public'>
               <typedef-decl name='duration' type-id='type-id-338' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='673' column='1' id='type-id-337'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='time_point' type-id='type-id-340' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='680' column='1' id='type-id-339'/>
             </member-type>
@@ -6474,15 +6381,12 @@ 
         <return type-id='type-id-94'/>
       </function-decl>
       <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-312'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-342'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-343'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-344'/>
           </member-type>
@@ -6526,33 +6430,26 @@ 
         </member-function>
       </class-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-345'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-347' 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-346'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-349' 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-348'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-93' 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-350'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-352' 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-351'/>
           </member-type>
       </class-decl>
       <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-315'>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-353'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-355'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-356'/>
           </member-type>
@@ -6596,19 +6493,15 @@ 
         </member-function>
       </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-357'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-347' 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-358'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-349' 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-359'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-333' 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-360'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-362' 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-361'/>
           </member-type>
@@ -6997,7 +6890,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-89'/>
       <return type-id='type-id-6'/>
@@ -7144,11 +7036,9 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-82'/>
     <array-type-def dimensions='1' type-id='type-id-82' size-in-bits='896' id='type-id-379'>
       <subrange length='112' type-id='type-id-174' id='type-id-380'/>
-
     </array-type-def>
     <typedef-decl name='__gthread_t' type-id='type-id-381' 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='53' column='1' id='type-id-382'/>
     <typedef-decl name='pthread_t' type-id='type-id-51' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-381'/>
@@ -7269,15 +7159,10 @@ 
     <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-530'/>
     <pointer-type-def type-id='type-id-531' size-in-bits='64' id='type-id-532'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='thread' 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/thread' line='60' column='1' id='type-id-461'>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-382' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/thread' line='63' column='1' id='type-id-533'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Impl_base' 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/thread' line='97' column='1' id='type-id-524'>
               <data-member access='public' layout-offset-in-bits='64'>
@@ -7298,11 +7183,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__shared_base_type' 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/thread' line='65' column='1' id='type-id-534'/>
           </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/thread' line='68' column='1' id='type-id-527'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -7835,7 +7718,6 @@ 
       </class-decl>
       <class-decl name='__weak_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' visibility='default' is-declaration-only='yes' id='type-id-442'/>
       <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl_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-538'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-525' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-535'/>
           </member-type>
@@ -7847,7 +7729,6 @@ 
       </function-decl>
       <class-decl name='_Mem_fn&lt;void (std::thread::*)()&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/functional' line='525' column='1' id='type-id-406'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-539'/>
-
           <member-type access='private'>
             <typedef-decl name='_Functor' type-id='type-id-385' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='528' column='1' id='type-id-540'/>
           </member-type>
@@ -7881,7 +7762,6 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;std::thread*, 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='103' column='1' id='type-id-541'/>
       <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (std::thread::*)()&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='1326' column='1' id='type-id-542'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-406' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-512'/>
           </member-type>
@@ -7943,7 +7823,6 @@ 
       </class-decl>
       <class-decl name='_Maybe_get_result_type&lt;false, std::thread&gt;' size-in-bits='8' is-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='75' column='1' id='type-id-547'/>
       <class-decl name='remove_reference&lt;std::reference_wrapper&lt;std::thread&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='1326' column='1' id='type-id-548'>
-
           <member-type access='public'>
             <typedef-decl name='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/type_traits' line='1327' column='1' id='type-id-516'/>
           </member-type>
@@ -7953,7 +7832,6 @@ 
         <return type-id='type-id-510'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (std::thread::*)()&gt;&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-549'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-406' 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-514'/>
           </member-type>
@@ -7967,7 +7845,6 @@ 
         <return type-id='type-id-523'/>
       </function-decl>
       <class-decl name='remove_reference&lt;void (std::thread::*)()&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1326' column='1' id='type-id-550'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-385' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-518'/>
           </member-type>
@@ -7981,7 +7858,6 @@ 
         <return type-id='type-id-454'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::_Mem_fn&lt;void (std::thread::*)()&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/tuple' line='56' column='1' id='type-id-551'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-477' 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-552'/>
           </member-type>
@@ -7989,7 +7865,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, std::_Mem_fn&lt;void (std::thread::*)()&gt;, std::reference_wrapper&lt;std::thread&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/tuple' line='215' column='1' id='type-id-418'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-424'/>
         <base-class access='public' layout-offset-in-bits='64' type-id='type-id-400'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-424' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-421'/>
           </member-type>
@@ -8078,7 +7953,6 @@ 
       <class-decl name='_Tuple_impl&lt;1ul, std::reference_wrapper&lt;std::thread&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-424'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-491'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-403'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-491' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-427'/>
           </member-type>
@@ -8223,7 +8097,6 @@ 
       </class-decl>
       <class-decl name='__uses_alloc0' size-in-bits='8' is-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/uses_allocator.h' line='69' column='1' id='type-id-553'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-554'/>
-
           <member-type access='public'>
             <class-decl name='_Anything' size-in-bits='8' is-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/uses_allocator.h' line='70' column='1' id='type-id-502'>
               <member-function access='public' constructor='yes'>
@@ -8289,7 +8162,6 @@ 
         <return type-id='type-id-552'/>
       </function-decl>
       <class-decl name='__add_ref&lt;std::reference_wrapper&lt;std::thread&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/tuple' line='56' column='1' id='type-id-555'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-510' 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-556'/>
           </member-type>
@@ -8370,7 +8242,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='_Bind_simple_helper&lt;void (std::thread::*)(), std::reference_wrapper&lt;std::thread&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/functional' line='1605' column='1' id='type-id-557'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-397' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1611' column='1' id='type-id-558'/>
           </member-type>
@@ -8422,7 +8293,6 @@ 
         <return type-id='type-id-558'/>
       </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-451'>
-
           <member-type access='private'>
             <typedef-decl name='__native_type' type-id='type-id-384' 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-560'/>
           </member-type>
@@ -8463,10 +8333,8 @@ 
         <return type-id='type-id-287'/>
       </function-decl>
       <class-decl name='__future_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/future' line='190' column='1' id='type-id-561'>
-
           <member-type access='public'>
             <class-decl name='_Result_base' 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/future' line='193' column='1' id='type-id-562'>
-
                 <member-type access='public'>
                   <class-decl name='_Deleter' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='203' column='1' id='type-id-563'>
                     <member-function access='public' const='yes'>
@@ -8536,10 +8404,8 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_State_base' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='307' column='1' id='type-id-430'>
-
                 <member-type access='private'>
                   <class-decl name='_Setter&lt;void, void&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/future' line='1182' column='1' id='type-id-568'>
                     <data-member access='public' layout-offset-in-bits='0'>
@@ -8553,7 +8419,6 @@ 
                     </member-function>
                   </class-decl>
                 </member-type>
-
                 <member-type access='private'>
                   <typedef-decl name='_Ptr_type' type-id='type-id-573' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='309' column='1' id='type-id-572'/>
                 </member-type>
@@ -8668,11 +8533,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Ptr' type-id='type-id-578' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='260' column='1' id='type-id-573'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Result&lt;void&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/future' line='543' column='1' id='type-id-579'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-562'/>
@@ -8684,7 +8547,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Async_state_common' size-in-bits='1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1422' column='1' id='type-id-494'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-430'/>
@@ -8731,7 +8593,6 @@ 
           </member-type>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (std::thread::*)()&gt;' size-in-bits='8' is-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='1102' column='1' id='type-id-581'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-406' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1104' column='1' id='type-id-582'/>
           </member-type>
@@ -8744,7 +8605,6 @@ 
       </class-decl>
       <class-decl name='_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='1088' 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='382' column='1' id='type-id-414'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-410'/>
-
           <member-type access='private'>
             <class-decl name='_Impl' 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/shared_ptr_base.h' line='387' column='1' id='type-id-483'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-448'/>
@@ -8817,7 +8677,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='aligned_storage&lt;112ul, 8ul&gt;' size-in-bits='8' is-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='1645' column='1' id='type-id-584'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='896' 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='1647' column='1' id='type-id-583'>
               <member-type access='private'>
@@ -8833,23 +8692,18 @@ 
           </member-type>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&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/bits/alloc_traits.h' line='87' column='1' id='type-id-586'>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-588' 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-587'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-587' 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-589'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-591' 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='156' column='1' id='type-id-590'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-590' 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='164' column='1' id='type-id-592'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='__construct_helper&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&gt;, const std::allocator&lt;std::__future_base::_State_base&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='238' column='1' id='type-id-593'>
               <data-member access='public' static='yes'>
@@ -8857,7 +8711,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='__destroy_helper&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&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='266' column='1' id='type-id-594'>
               <data-member access='public' static='yes'>
@@ -8890,11 +8743,9 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&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-445'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-387'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-591'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-482' 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-588'/>
           </member-type>
@@ -8927,7 +8778,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::__future_base::_State_base&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-595'>
-
           <member-type access='private'>
             <class-decl name='__construct_helper&lt;std::__future_base::_State_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/bits/alloc_traits.h' line='238' column='1' id='type-id-596'>
               <data-member access='public' static='yes'>
@@ -8935,7 +8785,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='__destroy_helper&lt;std::__future_base::_State_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/bits/alloc_traits.h' line='266' column='1' id='type-id-597'>
               <data-member access='public' static='yes'>
@@ -8973,23 +8822,18 @@ 
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;std::__future_base::_State_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/ext/new_allocator.h' line='54' column='1' id='type-id-389'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-602'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-497' 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-603'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-433' 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-604'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-496' 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-605'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-432' 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-606'/>
           </member-type>
@@ -9058,23 +8902,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::__future_base::_State_base, std::allocator&lt;std::__future_base::_State_base&gt;, (__gnu_cxx::_Lock_policy)2u&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-387'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-607'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-482' 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-608'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-417' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='60' column='1' id='type-id-609'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-481' 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-610'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-416' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='62' column='1' id='type-id-611'/>
           </member-type>
@@ -9147,7 +8986,6 @@ 
       <var-decl name='try_to_lock' type-id='type-id-599' mangled-name='_ZSt11try_to_lock' visibility='default' filepath='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' line='67' column='1' elf-symbol-id='_ZSt11try_to_lock@@GLIBCXX_3.4.11'/>
       <var-decl name='adopt_lock' type-id='type-id-240' mangled-name='_ZSt10adopt_lock' visibility='default' filepath='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' line='68' column='1' elf-symbol-id='_ZSt10adopt_lock@@GLIBCXX_3.4.11'/>
     </namespace-decl>
-
     <function-type size-in-bits='64' method-class-id='type-id-461' id='type-id-531'>
       <parameter type-id='type-id-523' is-artificial='yes'/>
       <return type-id='type-id-5'/>
@@ -9162,7 +9000,6 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-612' size-in-bits='64' id='type-id-613'/>
@@ -9248,7 +9085,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-617'/>
@@ -9332,7 +9168,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-620' size-in-bits='64' id='type-id-621'/>
@@ -9418,23 +9253,16 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-42'/>
     <type-decl name='char' size-in-bits='8' id='type-id-186'/>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='8' id='type-id-624'>
       <subrange length='1' type-id='type-id-174' id='type-id-175'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='160' id='type-id-625'>
       <subrange length='20' type-id='type-id-174' id='type-id-626'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='32' id='type-id-627'>
       <subrange length='4' type-id='type-id-174' id='type-id-628'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-629'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -9465,7 +9293,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-51'/>
     <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='infinite' id='type-id-632'>
       <subrange length='infinite' id='type-id-633'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-634'/>
     <type-decl name='void' id='type-id-5'/>
@@ -9862,7 +9689,6 @@ 
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-333'/>
     <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-848'/>
     <namespace-decl name='std'>
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_baseXX' 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/stl_list.h' line='78' column='1' id='type-id-793'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -9946,19 +9772,15 @@ 
       </function-decl>
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2112' visibility='default' 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='64' column='1' id='type-id-711'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' 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='73' column='1' id='type-id-850'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ctype_type' type-id='type-id-852' 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='84' column='1' id='type-id-851'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_put_type' type-id='type-id-854' 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='86' column='1' id='type-id-853'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_get_type' type-id='type-id-856' 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='88' column='1' id='type-id-855'/>
           </member-type>
@@ -10190,23 +10012,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='basic_streambuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='117' column='1' id='type-id-733'>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='129' column='1' id='type-id-866'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-869' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='130' column='1' id='type-id-868'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/streambuf' line='135' column='1' id='type-id-870'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='126' column='1' id='type-id-814'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='128' column='1' id='type-id-871'/>
           </member-type>
@@ -10566,23 +10383,18 @@ 
       <typedef-decl name='ptrdiff_t' type-id='type-id-22' 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++config.h' line='174' column='1' id='type-id-349'/>
       <typedef-decl name='streamsize' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='100' column='1' id='type-id-872'/>
       <class-decl name='char_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/char_traits.h' line='235' column='1' id='type-id-879'>
-
           <member-type access='public'>
             <typedef-decl name='pos_type' type-id='type-id-880' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='239' column='1' id='type-id-867'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='off_type' type-id='type-id-881' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='240' column='1' id='type-id-869'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='state_type' type-id='type-id-645' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='241' column='1' id='type-id-882'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='237' column='1' id='type-id-755'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='238' column='1' id='type-id-759'/>
           </member-type>
@@ -10693,7 +10505,6 @@ 
       </class-decl>
       <typedef-decl name='size_t' type-id='type-id-51' 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++config.h' line='173' column='1' id='type-id-94'/>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' 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='201' column='1' id='type-id-849'>
-
           <member-type access='private'>
             <enum-decl name='event' 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='421' column='1' id='type-id-883'>
               <underlying-type type-id='type-id-39'/>
@@ -10702,18 +10513,15 @@ 
               <enumerator name='copyfmt_event' value='2'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='event_callback' type-id='type-id-885' 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='438' column='1' id='type-id-884'/>
           </member-type>
-
           <member-type access='protected'>
             <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/ios_base.h' line='513' column='1' id='type-id-886'>
               <underlying-type type-id='type-id-39'/>
               <enumerator name='_S_local_word_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='failure' 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/ios_base.h' line='211' column='1' id='type-id-887'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
@@ -10763,7 +10571,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Words' 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/ios_base.h' line='501' column='1' id='type-id-890'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -10780,7 +10587,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='Init' 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/ios_base.h' line='535' column='1' id='type-id-892'>
               <data-member access='private' static='yes'>
@@ -10817,19 +10623,15 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-894' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='363' column='1' id='type-id-875'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-895' 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='395' column='1' id='type-id-874'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iostate' type-id='type-id-684' 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='332' column='1' id='type-id-861'/>
           </member-type>
-
           <member-type access='protected'>
             <class-decl name='_Callback_list' 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/ios_base.h' line='462' column='1' id='type-id-896'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -10867,7 +10669,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='fmtflags' type-id='type-id-899' 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='257' column='1' id='type-id-898'/>
           </member-type>
@@ -11204,19 +11005,15 @@ 
       </enum-decl>
       <class-decl name='basic_ios&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2112' visibility='default' 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='64' column='1' id='type-id-714'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
-
           <member-type access='private'>
             <typedef-decl name='__ctype_type' type-id='type-id-913' 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='84' column='1' id='type-id-912'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_put_type' type-id='type-id-915' 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='86' column='1' id='type-id-914'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_get_type' type-id='type-id-917' 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='88' column='1' id='type-id-916'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' 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='73' column='1' id='type-id-918'/>
           </member-type>
@@ -11448,23 +11245,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='basic_streambuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='512' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='117' column='1' id='type-id-736'>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-926' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='129' column='1' id='type-id-925'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-928' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='130' column='1' id='type-id-927'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/streambuf' line='135' column='1' id='type-id-929'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='126' column='1' id='type-id-817'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/streambuf' line='128' column='1' id='type-id-930'/>
           </member-type>
@@ -11822,23 +11614,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='char_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/char_traits.h' line='306' column='1' id='type-id-935'>
-
           <member-type access='public'>
             <typedef-decl name='off_type' type-id='type-id-881' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='310' column='1' id='type-id-928'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pos_type' type-id='type-id-936' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='311' column='1' id='type-id-926'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='308' column='1' id='type-id-762'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-635' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='309' column='1' id='type-id-766'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='state_type' type-id='type-id-645' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/char_traits.h' line='312' column='1' id='type-id-937'/>
           </member-type>
@@ -11948,15 +11735,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='109' column='1' id='type-id-369'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-939' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='119' column='1' id='type-id-938'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' 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/basic_string.h' line='152' column='1' id='type-id-742'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-940'/>
-
                 <member-type access='public'>
                   <typedef-decl name='_Raw_bytes_alloc' type-id='type-id-942' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='155' column='1' id='type-id-941'/>
                 </member-type>
@@ -12064,7 +11848,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' 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/basic_string.h' line='269' column='1' id='type-id-821'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
@@ -12089,39 +11872,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='118' column='1' id='type-id-745'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-687' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='117' column='1' id='type-id-944'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-946' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='120' column='1' id='type-id-945'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-948' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-947'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-264' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='124' column='1' id='type-id-949'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' 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/basic_string.h' line='126' column='1' id='type-id-950'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' 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/bits/basic_string.h' line='127' column='1' id='type-id-952'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' 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/bits/basic_string.h' line='128' column='1' id='type-id-954'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' 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/basic_string.h' line='145' column='1' id='type-id-940'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -13562,28 +13336,22 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='89' column='1' id='type-id-687'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-658'/>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='93' column='1' id='type-id-939'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&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/allocator.h' line='101' column='1' id='type-id-958'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-687' 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-942'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-943'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='96' column='1' id='type-id-946'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-674' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-948'/>
           </member-type>
@@ -13637,19 +13405,15 @@ 
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-953'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-959'/>
-
           <member-type access='private'>
             <typedef-decl name='iterator_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/bits/stl_iterator.h' line='111' column='1' id='type-id-960'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-962' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-961'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-963'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-966' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-965'/>
           </member-type>
@@ -13758,19 +13522,15 @@ 
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-955'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-971'/>
-
           <member-type access='private'>
             <typedef-decl name='iterator_type' type-id='type-id-264' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-972'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-973'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-976' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-975'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-978' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-977'/>
           </member-type>
@@ -13878,15 +13638,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='109' column='1' id='type-id-370'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-984' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='119' column='1' id='type-id-983'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' 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/basic_string.h' line='152' column='1' id='type-id-750'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-985'/>
-
                 <member-type access='public'>
                   <typedef-decl name='_Raw_bytes_alloc' type-id='type-id-987' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='155' column='1' id='type-id-986'/>
                 </member-type>
@@ -13994,7 +13751,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' 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/basic_string.h' line='269' column='1' id='type-id-827'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-690'/>
@@ -14019,39 +13775,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-988' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='118' column='1' id='type-id-753'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-690' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='117' column='1' id='type-id-989'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-991' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='120' column='1' id='type-id-990'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-993' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-992'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-267' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='124' column='1' id='type-id-994'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-996' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='126' column='1' id='type-id-995'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='127' column='1' id='type-id-997'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1000' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='128' column='1' id='type-id-999'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' 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/basic_string.h' line='145' column='1' id='type-id-985'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -15492,28 +15239,22 @@ 
       </class-decl>
       <class-decl name='allocator&lt;wchar_t&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-690'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-660'/>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='93' column='1' id='type-id-984'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='rebind&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/allocator.h' line='101' column='1' id='type-id-1001'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-687' 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-987'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='92' column='1' id='type-id-988'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='96' column='1' id='type-id-991'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-785' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-993'/>
           </member-type>
@@ -15560,19 +15301,15 @@ 
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-998'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1002'/>
-
           <member-type access='private'>
             <typedef-decl name='iterator_type' type-id='type-id-996' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-1003'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-1004'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1007' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-1006'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1009' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-1008'/>
           </member-type>
@@ -15681,19 +15418,15 @@ 
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-1000'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1014'/>
-
           <member-type access='private'>
             <typedef-decl name='iterator_type' type-id='type-id-267' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-1015'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1017' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-1016'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1019' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-1018'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1021' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-1020'/>
           </member-type>
@@ -15802,26 +15535,20 @@ 
       </class-decl>
       <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='56' column='1' id='type-id-801'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-711'/>
-
           <member-type access='private'>
             <typedef-decl name='__ctype_type' type-id='type-id-852' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='72' column='1' id='type-id-1026'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='60' column='1' id='type-id-1027'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='sentry' 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/istream' line='655' column='1' id='type-id-719'>
-
                 <member-type access='private'>
                   <typedef-decl name='__streambuf_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/istream' line='663' column='1' id='type-id-1028'/>
                 </member-type>
-
                 <member-type access='private'>
                   <typedef-decl name='__ctype_type' type-id='type-id-1026' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='665' column='1' id='type-id-1029'/>
                 </member-type>
-
                 <member-type access='private'>
                   <typedef-decl name='__int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='666' column='1' id='type-id-1030'/>
                 </member-type>
@@ -15852,31 +15579,24 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='62' column='1' id='type-id-1031'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-869' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='63' column='1' id='type-id-1032'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ios_type' type-id='type-id-711' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='68' column='1' id='type-id-1033'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_get_type' type-id='type-id-856' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='71' column='1' id='type-id-1034'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__istream_type' type-id='type-id-801' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='69' column='1' id='type-id-804'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='61' column='1' id='type-id-717'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/istream' line='67' column='1' id='type-id-1035'/>
           </member-type>
@@ -16329,18 +16049,14 @@ 
       </class-decl>
       <class-decl name='basic_istream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2240' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='56' column='1' id='type-id-807'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-714'/>
-
           <member-type access='private'>
             <class-decl name='sentry' 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/istream' line='655' column='1' id='type-id-724'>
-
                 <member-type access='private'>
                   <typedef-decl name='__streambuf_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/istream' line='663' column='1' id='type-id-1054'/>
                 </member-type>
-
                 <member-type access='private'>
                   <typedef-decl name='__ctype_type' type-id='type-id-1056' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='665' column='1' id='type-id-1055'/>
                 </member-type>
-
                 <member-type access='private'>
                   <typedef-decl name='__int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='666' column='1' id='type-id-1057'/>
                 </member-type>
@@ -16371,39 +16087,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='60' column='1' id='type-id-1058'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ctype_type' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='72' column='1' id='type-id-1056'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-926' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='62' column='1' id='type-id-1059'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-928' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='63' column='1' id='type-id-1060'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ios_type' type-id='type-id-714' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='68' column='1' id='type-id-1061'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_get_type' type-id='type-id-917' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='71' column='1' id='type-id-1062'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__istream_type' type-id='type-id-807' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='69' column='1' id='type-id-810'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='61' column='1' id='type-id-722'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/istream' line='67' column='1' id='type-id-1063'/>
           </member-type>
@@ -16880,19 +16587,15 @@ 
       <class-decl name='binary_function&lt;const wchar_t*, const wchar_t*, 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-1072'/>
       <class-decl name='istreambuf_iteratorXX&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-769'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1073'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='69' column='1' id='type-id-839'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1074'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1075'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='istream_type' type-id='type-id-801' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-837'/>
           </member-type>
@@ -16964,19 +16667,15 @@ 
       <class-decl name='iterator&lt;std::input_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1073'/>
       <class-decl name='istreambuf_iteratorXX&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-773'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1076'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='69' column='1' id='type-id-845'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1077'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1078'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='istream_type' type-id='type-id-807' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-843'/>
           </member-type>
@@ -17048,39 +16747,30 @@ 
       <class-decl name='iterator&lt;std::input_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-1076'/>
       <class-decl name='basic_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='69' column='1' id='type-id-693'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-733'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-693' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='80' column='1' id='type-id-1079'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__file_type' type-id='type-id-1081' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='81' column='1' id='type-id-1080'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__state_type' type-id='type-id-882' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='82' column='1' id='type-id-1082'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='73' column='1' id='type-id-1083'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__codecvt_type' type-id='type-id-1085' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='83' column='1' id='type-id-1084'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='75' column='1' id='type-id-1086'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='76' column='1' id='type-id-1087'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-869' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='77' column='1' id='type-id-1088'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/fstream' line='79' column='1' id='type-id-1089'/>
           </member-type>
@@ -17373,39 +17063,30 @@ 
       </class-decl>
       <class-decl name='basic_filebuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='1920' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='69' column='1' id='type-id-696'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-736'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-696' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='80' column='1' id='type-id-1097'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__file_type' type-id='type-id-1081' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='81' column='1' id='type-id-1098'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__state_type' type-id='type-id-937' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='82' column='1' id='type-id-1099'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='73' column='1' id='type-id-1100'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__codecvt_type' type-id='type-id-1102' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='83' column='1' id='type-id-1101'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='75' column='1' id='type-id-1103'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-926' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='76' column='1' id='type-id-1104'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-928' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='77' column='1' id='type-id-1105'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/fstream' line='79' column='1' id='type-id-1106'/>
           </member-type>
@@ -17701,23 +17382,18 @@ 
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='54' column='1' id='type-id-658'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1113'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-93' 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-1114'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-4' 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-1115'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-352' 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-1116'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-674' 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-1117'/>
           </member-type>
@@ -17794,19 +17470,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='710' column='1' id='type-id-264'>
-
           <member-type access='private'>
             <typedef-decl name='iterator_category' type-id='type-id-346' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='719' column='1' id='type-id-1118'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-348' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='721' column='1' id='type-id-275'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-351' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='722' column='1' id='type-id-1119'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-350' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='723' column='1' id='type-id-1120'/>
           </member-type>
@@ -17907,15 +17579,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='710' column='1' id='type-id-951'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1122' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='721' column='1' id='type-id-1121'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1124' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='722' column='1' id='type-id-1123'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1126' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='723' column='1' id='type-id-1125'/>
           </member-type>
@@ -18016,23 +17685,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;wchar_t&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/ext/new_allocator.h' line='54' column='1' id='type-id-660'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1131'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-333' 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-1132'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-354' 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-1133'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-362' 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-1134'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-785' 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-1135'/>
           </member-type>
@@ -18109,19 +17773,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__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;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='710' column='1' id='type-id-267'>
-
           <member-type access='private'>
             <typedef-decl name='iterator_category' type-id='type-id-358' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='719' column='1' id='type-id-1136'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-359' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='721' column='1' id='type-id-280'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-361' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='722' column='1' id='type-id-1137'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-360' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='723' column='1' id='type-id-1138'/>
           </member-type>
@@ -18222,15 +17882,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__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;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='710' column='1' id='type-id-996'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-1140' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='721' column='1' id='type-id-1139'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-1142' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='722' column='1' id='type-id-1141'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1144' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='723' column='1' id='type-id-1143'/>
           </member-type>
@@ -18365,7 +18022,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-635'/>
@@ -18842,8 +18498,6 @@ 
       <parameter type-id='type-id-847'/>
       <return type-id='type-id-6'/>
     </function-decl>
-
-
     <function-type size-in-bits='64' id='type-id-662'>
       <parameter type-id='type-id-674'/>
       <parameter type-id='type-id-674'/>
@@ -18918,7 +18572,6 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-1158'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1162'/>
             </member-type>
@@ -19055,7 +18708,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-1165'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-1169'/>
             </member-type>
@@ -19202,7 +18854,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='time_point&lt;std::chrono::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='523' column='1' id='type-id-340'>
-
             <member-type access='public'>
               <typedef-decl name='duration' type-id='type-id-1158' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='526' column='1' id='type-id-1175'/>
             </member-type>
@@ -19256,13 +18907,11 @@ 
         <typedef-decl name='microseconds' type-id='type-id-1158' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='507' column='1' id='type-id-338'/>
       </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-1189'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1158' 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-1186'/>
           </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-1190'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1158' 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-1187'/>
           </member-type>
@@ -19275,10 +18924,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/condition_variable.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'>
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='384' id='type-id-1191'>
       <subrange length='48' type-id='type-id-174' id='type-id-1192'/>
-
     </array-type-def>
     <typedef-decl name='__gthread_cond_t' type-id='type-id-1193' 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='58' column='1' id='type-id-1194'/>
     <typedef-decl name='pthread_cond_t' type-id='type-id-1195' filepath='/usr/include/bits/pthreadtypes.h' line='130' column='1' id='type-id-1193'/>
@@ -19338,11 +18985,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
     <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1216'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='467' column='1' id='type-id-1202'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='470' column='1' id='type-id-1214'/>
           </member-type>
@@ -19475,11 +19118,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='condition_variable' 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/condition_variable' line='59' column='1' id='type-id-574'>
-
           <member-type access='private'>
             <typedef-decl name='__native_type' type-id='type-id-1194' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='62' column='1' id='type-id-1208'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='native_handle_type' type-id='type-id-1209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='71' column='1' id='type-id-1217'/>
           </member-type>
@@ -19613,19 +19254,13 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </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'>
-
-
     <array-type-def dimensions='1' type-id='type-id-1218' size-in-bits='4032' id='type-id-1219'>
       <subrange length='9' type-id='type-id-174' id='type-id-1220'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='3008' id='type-id-1221'>
       <subrange length='47' type-id='type-id-174' id='type-id-1222'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1224'/>
     <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-1225'/>
@@ -19877,7 +19512,6 @@ 
         </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-1223'>
-
           <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-1257'>
               <underlying-type type-id='type-id-39'/>
@@ -19887,7 +19521,6 @@ 
               <enumerator name='__last_constness' value='3'/>
             </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-1258'>
               <underlying-type type-id='type-id-39'/>
@@ -19900,10 +19533,8 @@ 
               <enumerator name='__last_state' value='6'/>
             </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-1218'>
-
                 <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-1259'>
                     <underlying-type type-id='type-id-39'/>
@@ -19914,7 +19545,6 @@ 
                     <enumerator name='__string' value='4'/>
                   </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-1260'>
                     <member-type access='private'>
@@ -20034,7 +19664,6 @@ 
               </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-1265'>
               <underlying-type type-id='type-id-39'/>
@@ -20378,11 +20007,7 @@ 
       <var-decl name='_S_debug_messages' type-id='type-id-1221' 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-1267'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1228' 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-1252'/>
           </member-type>
@@ -20397,7 +20022,6 @@ 
         <return type-id='type-id-5'/>
       </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-1268'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-41' 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-1254'/>
           </member-type>
@@ -20411,10 +20035,7 @@ 
         <parameter type-id='type-id-1047'/>
         <return type-id='type-id-5'/>
       </function-decl>
-
     </namespace-decl>
-
-
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-92'/>
@@ -20440,7 +20061,6 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/fstream-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'>
     <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-1269'>
-
         <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-1270'>
             <data-member access='private'>
@@ -20508,8 +20128,6 @@ 
     <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1311'/>
     <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1313'/>
     <namespace-decl name='std'>
-
-
       <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-1314'/>
         <return type-id='type-id-1315'/>
@@ -20525,7 +20143,6 @@ 
       </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-1278'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1319'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-693' 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-1297'/>
           </member-type>
@@ -20691,7 +20308,6 @@ 
       </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-1290'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1320'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-693' 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-1309'/>
           </member-type>
@@ -20857,7 +20473,6 @@ 
       </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-1284'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-801'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-693' 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-1303'/>
           </member-type>
@@ -21023,7 +20638,6 @@ 
       </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-1281'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1321'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-696' 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-1300'/>
           </member-type>
@@ -21189,7 +20803,6 @@ 
       </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-1293'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1322'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-696' 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-1312'/>
           </member-type>
@@ -21355,7 +20968,6 @@ 
       </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-1287'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
-
           <member-type access='private'>
             <typedef-decl name='__filebuf_type' type-id='type-id-696' 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-1306'/>
           </member-type>
@@ -21520,14 +21132,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functexcept.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'>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='128' id='type-id-1323'>
       <subrange length='16' type-id='type-id-174' id='type-id-1324'/>
-
     </array-type-def>
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1325'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -21653,10 +21261,6 @@ 
     <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1482'/>
     <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1326'/>
     <namespace-decl name='std'>
-
-
-
-
       <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-1484'>
           <underlying-type type-id='type-id-39'/>
@@ -21678,7 +21282,6 @@ 
       </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-1409'>
-
             <member-type access='public'>
               <typedef-decl name='_OpcodeT' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='202' column='1' id='type-id-1485'/>
             </member-type>
@@ -21758,7 +21361,6 @@ 
         <typedef-decl name='_Tagger' type-id='type-id-1429' 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-1413'/>
         <typedef-decl name='_Matcher' type-id='type-id-1425' 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-1400'/>
         <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-1465'>
-
             <member-type access='public'>
               <typedef-decl name='_StateT' type-id='type-id-41' 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-1407'/>
             </member-type>
@@ -21780,7 +21382,6 @@ 
           </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-1397'>
-
             <member-type access='private'>
               <typedef-decl name='_SizeT' type-id='type-id-41' 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-1487'/>
             </member-type>
@@ -21799,7 +21400,6 @@ 
           </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-1488'>
         <underlying-type type-id='type-id-39'/>
         <enumerator name='future_already_retrieved' value='1'/>
@@ -21814,7 +21414,6 @@ 
       <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-1429'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1489'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1350'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-1482' 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-1490'/>
           </member-type>
@@ -21894,7 +21493,6 @@ 
       </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-1491'/>
       <class-decl name='_Function_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/functional' line='1723' column='1' id='type-id-1350'>
-
           <member-type access='private'>
             <typedef-decl name='_Manager_type' type-id='type-id-1336' 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-1492'/>
           </member-type>
@@ -21975,7 +21573,6 @@ 
       <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-1425'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1496'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1350'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-1334' 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-1497'/>
           </member-type>
@@ -22068,14 +21665,11 @@ 
       </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-1422'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1331'/>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-1499'/>
           </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-1500'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1422' 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-1501'/>
                 </member-type>
@@ -22153,7 +21747,6 @@ 
         <parameter type-id='type-id-1484'/>
         <return type-id='type-id-5'/>
       </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-287'/>
       </function-decl>
@@ -22182,7 +21775,6 @@ 
         </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-1353'>
-
           <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-1445'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1419'/>
@@ -22225,59 +21817,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1505'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-1506' 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-1357'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1507' 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-1442'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-1509' 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-1508'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='key_type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='342' column='1' id='type-id-1363'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='value_type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='343' column='1' id='type-id-1366'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-1368' 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-1510'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Link_type' type-id='type-id-1452' 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-1511'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-1387' 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-1512'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='allocator_type' type-id='type-id-1416' 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-1360'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1378' 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-1513'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-1369' 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-1514'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-1516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='569' column='1' id='type-id-1515'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-1518' 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-1517'/>
           </member-type>
@@ -22804,10 +22382,8 @@ 
       <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-1522'/>
       <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-1416'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1327'/>
-
           <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-1523'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1419' 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-1506'/>
                 </member-type>
@@ -22835,23 +22411,18 @@ 
         </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-1378'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1525' 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-1524'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1046' 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-1526'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-109' 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-1527'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1378' 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-1381'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1452' 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-1528'/>
           </member-type>
@@ -22925,27 +22496,21 @@ 
         </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-1369'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1530' 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-1529'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-284' 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-1531'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1519' 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-1532'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1378' 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-1375'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-1369' 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-1372'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1387' 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-1533'/>
           </member-type>
@@ -23036,7 +22601,6 @@ 
       <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-1520'/>
       <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-1521'/>
       <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-1388'>
-
           <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-1458'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1422'/>
@@ -23078,15 +22642,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1535' 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-1534'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-1536' 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-1391'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1422' 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-1394'/>
           </member-type>
@@ -23192,21 +22753,17 @@ 
         </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-1537'>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-1499' 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-1538'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1538' 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-1539'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-1541' 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-1540'/>
           </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-1542'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1501' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='72' column='1' id='type-id-1541'/>
           </member-type>
@@ -23325,23 +22882,18 @@ 
     </namespace-decl>
     <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-1331'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1547'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-1548'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1412' 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-1549'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-1550'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1411' 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-1551'/>
           </member-type>
@@ -23403,23 +22955,18 @@ 
         </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-1329'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1552'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1452' 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-1553'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1387' 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-1554'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1451' 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-1555'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-1386' 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-1556'/>
           </member-type>
@@ -23488,23 +23035,18 @@ 
         </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-1327'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-94' 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-1557'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-109' 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-1558'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-1519' 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-1559'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1046' 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-1560'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-284' 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-1561'/>
           </member-type>
@@ -23566,22 +23108,18 @@ 
         </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-1562'>
-
           <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-1563'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1540' 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-1536'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1539' 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-1535'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
     <function-type size-in-bits='64' id='type-id-1333'>
       <parameter type-id='type-id-1348'/>
       <parameter type-id='type-id-1405'/>
@@ -23606,7 +23144,6 @@ 
   </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'>
     <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
@@ -23725,17 +23262,12 @@ 
     <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1691'/>
     <reference-type-def kind='lvalue' type-id='type-id-1643' size-in-bits='64' id='type-id-1692'/>
     <namespace-decl name='std'>
-
-
-
       <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-1693'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1669' 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-1694'/>
           </member-type>
       </class-decl>
       <class-decl name='promise&lt;void&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/future' line='1106' column='1' id='type-id-1618'>
-
           <member-type access='private'>
             <typedef-decl name='_Ptr_type' type-id='type-id-573' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1110' column='1' id='type-id-571'/>
           </member-type>
@@ -23956,30 +23488,24 @@ 
         </member-function>
       </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-1696'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-496' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1695'/>
           </member-type>
       </class-decl>
       <class-decl name='unique_ptr&lt;std::__future_base::_Result&lt;void&gt;, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='88' column='1' id='type-id-578'>
-
           <member-type access='private'>
             <class-decl name='_Pointer' 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/unique_ptr.h' line='91' column='1' id='type-id-1697'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-580' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='102' column='1' id='type-id-1698'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1627' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1699'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1698' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='109' column='1' id='type-id-1700'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-563' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='111' column='1' id='type-id-1636'/>
           </member-type>
@@ -24168,7 +23694,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1575'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1587'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1566'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-1587' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-1578'/>
           </member-type>
@@ -24249,7 +23774,6 @@ 
       <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1587'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-491'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1572'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-491' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-1590'/>
           </member-type>
@@ -24399,26 +23923,22 @@ 
         </member-function>
       </class-decl>
       <class-decl name='conditional&lt;false, std::__future_base::_Result_base::_Deleter, const std::__future_base::_Result_base::_Deleter&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='1735' column='1' id='type-id-1703'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1603' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1736' column='1' id='type-id-1701'/>
           </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1326' column='1' id='type-id-1704'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-563' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-1677'/>
           </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_Result&lt;void&gt;, 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-1705'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1663' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1702'/>
           </member-type>
       </class-decl>
       <class-decl name='future&lt;void&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/future' line='728' column='1' id='type-id-1611'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1593'/>
-
           <member-type access='private'>
             <typedef-decl name='__state_type' type-id='type-id-1597' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='737' column='1' id='type-id-1614'/>
           </member-type>
@@ -24478,11 +23998,9 @@ 
       </class-decl>
       <class-decl name='__basic_future&lt;void&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/future' line='552' column='1' id='type-id-1593'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-561'/>
-
           <member-type access='protected'>
             <typedef-decl name='__state_type' type-id='type-id-1624' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='555' column='1' id='type-id-1597'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='__result_type' type-id='type-id-1663' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='556' column='1' id='type-id-1706'/>
           </member-type>
@@ -24614,24 +24132,19 @@ 
         </member-function>
       </class-decl>
       <class-decl name='unique_ptr&lt;std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='88' column='1' id='type-id-1639'>
-
           <member-type access='private'>
             <class-decl name='_Pointer' 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/unique_ptr.h' line='91' column='1' id='type-id-1707'>
-
                 <member-type access='private'>
                   <typedef-decl name='type' type-id='type-id-565' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='102' column='1' id='type-id-1708'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__tuple_type' type-id='type-id-1630' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1709'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-1708' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='109' column='1' id='type-id-1710'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='deleter_type' type-id='type-id-563' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='111' column='1' id='type-id-1643'/>
           </member-type>
@@ -24820,7 +24333,6 @@ 
       <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1581'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1587'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1569'/>
-
           <member-type access='public'>
             <typedef-decl name='_Inherited' type-id='type-id-1587' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-1584'/>
           </member-type>
@@ -24936,7 +24448,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_Result_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-1712'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-567' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1711'/>
           </member-type>
@@ -24944,7 +24455,6 @@ 
       <class-decl name='function&lt;std::unique_ptr&lt;std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter&gt;()&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-575'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1713'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1350'/>
-
           <member-type access='private'>
             <typedef-decl name='_Invoker_type' type-id='type-id-1565' 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-1714'/>
           </member-type>
@@ -25023,7 +24533,6 @@ 
         <return type-id='type-id-1694'/>
       </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-1715'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1670' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='57' column='1' id='type-id-1716'/>
           </member-type>
@@ -25041,9 +24550,6 @@ 
         <return type-id='type-id-1694'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <function-type size-in-bits='64' id='type-id-1564'>
       <parameter type-id='type-id-1348'/>
       <return type-id='type-id-1639'/>
@@ -26231,17 +25737,12 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/mutex.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'>
-
-
-
       <function-decl name='__once_proxy' mangled-name='__once_proxy' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__once_proxy@@GLIBCXX_3.4.11'>
         <return type-id='type-id-5'/>
       </function-decl>
       <var-decl name='__once_callable' type-id='type-id-36' mangled-name='_ZSt15__once_callable' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='45' column='1' elf-symbol-id='_ZSt15__once_callable@@GLIBCXX_3.4.11'/>
       <var-decl name='__once_call' type-id='type-id-89' mangled-name='_ZSt11__once_call' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='46' column='1' elf-symbol-id='_ZSt11__once_call@@GLIBCXX_3.4.11'/>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.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'>
     <qualified-type-def type-id='type-id-1742' const='yes' id='type-id-1743'/>
@@ -26274,7 +25775,6 @@ 
     <qualified-type-def type-id='type-id-1796' const='yes' id='type-id-1797'/>
     <qualified-type-def type-id='type-id-1798' const='yes' id='type-id-1799'/>
     <namespace-decl name='std'>
-
       <namespace-decl name='placeholders'>
         <var-decl name='_1' type-id='type-id-1763' 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-1785' 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'/>
@@ -26342,13 +25842,6 @@ 
     <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1802'/>
     <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-1803'/>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <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-1800'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1543'/>
         <data-member access='private' layout-offset-in-bits='128'>
@@ -26397,16 +25890,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </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'>
     <qualified-type-def type-id='type-id-1804' const='yes' id='type-id-1805'/>
     <pointer-type-def type-id='type-id-1805' size-in-bits='64' id='type-id-1806'/>
     <pointer-type-def type-id='type-id-1804' size-in-bits='64' id='type-id-1807'/>
     <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-1804'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -26438,8 +25927,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </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'>
     <qualified-type-def type-id='type-id-821' const='yes' id='type-id-1808'/>
@@ -26456,22 +25943,16 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-953' size-in-bits='64' id='type-id-970'/>
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-967'/>
     <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-1813'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-1118' 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-1814'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-275' 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-974'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1120' 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-976'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1119' 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-978'/>
           </member-type>
@@ -26509,15 +25990,12 @@ 
       <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-971'/>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, const char*, const char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-959'/>
       <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-1816'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1121' 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-962'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1125' 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-964'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1123' 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-966'/>
           </member-type>
@@ -26534,7 +26012,6 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-decl>
-
   </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'>
     <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-367'/>
@@ -26543,8 +26020,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-285' size-in-bits='64' id='type-id-366'/>
     <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-365'/>
     <namespace-decl name='std'>
-
-
       <function-decl name='operator==' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-367'/>
         <parameter type-id='type-id-367'/>
@@ -26554,17 +26029,11 @@ 
         <return type-id='type-id-287'/>
       </function-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/thread.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'>
     <reference-type-def kind='lvalue' type-id='type-id-1818' size-in-bits='64' id='type-id-1819'/>
     <reference-type-def kind='lvalue' type-id='type-id-526' size-in-bits='64' id='type-id-1820'/>
     <namespace-decl name='std'>
-
-
-
       <namespace-decl name=''>
         <function-decl name='execute_native_thread_routine' filepath='../../../.././libstdc++-v3/src/c++11/thread.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-36'/>
@@ -26577,7 +26046,6 @@ 
         <return type-id='type-id-42'/>
       </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-1821'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-526' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-1818'/>
           </member-type>
@@ -26592,9 +26060,6 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <function-decl name='get_nprocs' filepath='/usr/include/sys/sysinfo.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -26614,22 +26079,16 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1025'/>
     <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1022'/>
     <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-1827'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-1136' 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-1828'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-280' 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-1017'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1138' 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-1019'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1137' 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-1021'/>
           </member-type>
@@ -26667,15 +26126,12 @@ 
       <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-1014'/>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, const wchar_t*, const wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1002'/>
       <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-1830'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-1139' 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-1005'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1143' 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-1007'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1141' 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-1009'/>
           </member-type>
@@ -26692,18 +26148,12 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-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'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='64' id='type-id-1831'>
       <subrange length='8' type-id='type-id-174' id='type-id-1832'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-1833' size-in-bits='64' id='type-id-1834'/>
     <pointer-type-def type-id='type-id-1833' size-in-bits='64' id='type-id-1835'/>
@@ -26808,7 +26258,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1968' size-in-bits='64' id='type-id-1971'/>
     <pointer-type-def type-id='type-id-1968' size-in-bits='64' id='type-id-1972'/>
     <namespace-decl name='std'>
-
       <function-decl name='__addressof&lt;char&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-352'/>
         <return type-id='type-id-93'/>
@@ -26870,21 +26319,17 @@ 
         </member-function>
       </class-decl>
       <class-decl name='unary_function&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt;, 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-1973'>
-
           <member-type access='public'>
             <typedef-decl name='argument_type' type-id='type-id-1958' 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='106' column='1' id='type-id-1974'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-42' 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='109' column='1' id='type-id-1975'/>
           </member-type>
       </class-decl>
       <class-decl name='unary_function&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt;, 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-1976'>
-
           <member-type access='public'>
             <typedef-decl name='argument_type' type-id='type-id-1955' 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='106' column='1' id='type-id-1977'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-42' 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='109' column='1' id='type-id-1978'/>
           </member-type>
@@ -26965,23 +26410,18 @@ 
           <return type-id='type-id-94'/>
         </function-decl>
         <class-decl name='__mini_vector&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/ext/bitmap_allocator.h' line='70' column='1' id='type-id-1861'>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1972' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='77' column='1' id='type-id-1981'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1971' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='78' column='1' id='type-id-1982'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1970' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1903'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1905'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1981' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='82' column='1' id='type-id-1983'/>
             </member-type>
@@ -27108,27 +26548,21 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__mini_vector&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt; &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/ext/bitmap_allocator.h' line='70' column='1' id='type-id-1867'>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1966' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='77' column='1' id='type-id-1984'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1965' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='78' column='1' id='type-id-1985'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1917'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1919'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='81' column='1' id='type-id-1986'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1984' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='82' column='1' id='type-id-1987'/>
             </member-type>
@@ -27255,15 +26689,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Bitmap_counter&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&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/ext/bitmap_allocator.h' line='397' column='1' id='type-id-1839'>
-
             <member-type access='private'>
               <typedef-decl name='_BPVector' type-id='type-id-1867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='400' column='1' id='type-id-1844'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Index_type' type-id='type-id-1919' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='401' column='1' id='type-id-1988'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='402' column='1' id='type-id-1989'/>
             </member-type>
@@ -27340,11 +26771,9 @@ 
         </class-decl>
         <class-decl name='_Functor_Ref&lt;__gnu_cxx::__detail::_Ffit_finder&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='306' column='1' id='type-id-1855'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1973'/>
-
             <member-type access='private'>
               <typedef-decl name='argument_type' type-id='type-id-1974' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='313' column='1' id='type-id-1990'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='result_type' type-id='type-id-1975' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='314' column='1' id='type-id-1991'/>
             </member-type>
@@ -27368,11 +26797,9 @@ 
         </class-decl>
         <class-decl name='_Ffit_finder&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&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/ext/bitmap_allocator.h' line='332' column='1' id='type-id-1851'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1973'/>
-
             <member-type access='private'>
               <typedef-decl name='_Counter_type' type-id='type-id-1986' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='337' column='1' id='type-id-1992'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Block_pair' type-id='type-id-1958' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='335' column='1' id='type-id-1993'/>
             </member-type>
@@ -27410,11 +26837,9 @@ 
         </class-decl>
         <class-decl name='_Inclusive_between&lt;__gnu_cxx::bitmap_allocator&lt;wchar_t&gt;::_Alloc_block*&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='282' column='1' id='type-id-1859'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1973'/>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1879' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='285' column='1' id='type-id-1994'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Block_pair' type-id='type-id-1958' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='287' column='1' id='type-id-1995'/>
             </member-type>
@@ -27457,27 +26882,21 @@ 
           <return type-id='type-id-1972'/>
         </function-decl>
         <class-decl name='__mini_vector&lt;std::pair&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*, __gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt; &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/ext/bitmap_allocator.h' line='70' column='1' id='type-id-1864'>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='77' column='1' id='type-id-1996'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='reference' type-id='type-id-1963' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='78' column='1' id='type-id-1997'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_reference' type-id='type-id-1957' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='79' column='1' id='type-id-1910'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='80' column='1' id='type-id-1912'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='difference_type' type-id='type-id-349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='81' column='1' id='type-id-1998'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-1996' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='82' column='1' id='type-id-1999'/>
             </member-type>
@@ -27604,15 +27023,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Bitmap_counter&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&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/ext/bitmap_allocator.h' line='397' column='1' id='type-id-1833'>
-
             <member-type access='private'>
               <typedef-decl name='_BPVector' type-id='type-id-1864' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='400' column='1' id='type-id-1838'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Index_type' type-id='type-id-1912' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='401' column='1' id='type-id-2000'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1873' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='402' column='1' id='type-id-2001'/>
             </member-type>
@@ -27689,11 +27105,9 @@ 
         </class-decl>
         <class-decl name='_Functor_Ref&lt;__gnu_cxx::__detail::_Ffit_finder&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='306' column='1' id='type-id-1853'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1976'/>
-
             <member-type access='private'>
               <typedef-decl name='argument_type' type-id='type-id-1977' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='313' column='1' id='type-id-2002'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='result_type' type-id='type-id-1978' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='314' column='1' id='type-id-2003'/>
             </member-type>
@@ -27717,11 +27131,9 @@ 
         </class-decl>
         <class-decl name='_Ffit_finder&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&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/ext/bitmap_allocator.h' line='332' column='1' id='type-id-1847'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1976'/>
-
             <member-type access='private'>
               <typedef-decl name='_Counter_type' type-id='type-id-1998' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='337' column='1' id='type-id-2004'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Block_pair' type-id='type-id-1955' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='335' column='1' id='type-id-2005'/>
             </member-type>
@@ -27759,11 +27171,9 @@ 
         </class-decl>
         <class-decl name='_Inclusive_between&lt;__gnu_cxx::bitmap_allocator&lt;char&gt;::_Alloc_block*&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='282' column='1' id='type-id-1857'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1976'/>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-1873' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='285' column='1' id='type-id-2006'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='_Block_pair' type-id='type-id-1955' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='287' column='1' id='type-id-2007'/>
             </member-type>
@@ -27788,7 +27198,6 @@ 
       </namespace-decl>
       <class-decl name='bitmap_allocator&lt;wchar_t&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/ext/bitmap_allocator.h' line='688' column='1' id='type-id-1876'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1882'/>
-
           <member-type access='private'>
             <class-decl name='_Alloc_block' 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/ext/bitmap_allocator.h' line='717' column='1' id='type-id-1878'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -27796,39 +27205,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_BPVector' type-id='type-id-1867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='726' column='1' id='type-id-2008'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__mutex_type' type-id='type-id-1884' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='698' column='1' id='type-id-2009'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1937'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='693' column='1' id='type-id-2010'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='694' column='1' id='type-id-2011'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='695' column='1' id='type-id-1935'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-785' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='696' column='1' id='type-id-1933'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Block_pair' type-id='type-id-1958' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='724' column='1' id='type-id-2012'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_BPiter' type-id='type-id-1987' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='727' column='1' id='type-id-2013'/>
           </member-type>
@@ -27978,7 +27378,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='free_list' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='522' column='1' id='type-id-1882'>
-
           <member-type access='private'>
             <class-decl name='_LT_pointer_compare' size-in-bits='8' is-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/bitmap_allocator.h' line='531' column='1' id='type-id-1939'>
               <member-function access='public' const='yes'>
@@ -27991,15 +27390,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='vector_type' type-id='type-id-1861' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='526' column='1' id='type-id-1886'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-1983' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='527' column='1' id='type-id-2015'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__mutex_type' type-id='type-id-61' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='528' column='1' id='type-id-1884'/>
           </member-type>
@@ -28052,7 +27448,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='bitmap_allocator&lt;void&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/ext/bitmap_allocator.h' line='668' column='1' id='type-id-2016'>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' 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/bitmap_allocator.h' line='672' column='1' id='type-id-2014'/>
           </member-type>
@@ -28063,7 +27458,6 @@ 
       </function-decl>
       <class-decl name='bitmap_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='688' column='1' id='type-id-1870'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1882'/>
-
           <member-type access='private'>
             <class-decl name='_Alloc_block' 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/ext/bitmap_allocator.h' line='717' column='1' id='type-id-1872'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -28071,39 +27465,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_BPVector' type-id='type-id-1864' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='726' column='1' id='type-id-2017'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__mutex_type' type-id='type-id-1884' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='698' column='1' id='type-id-2018'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='691' column='1' id='type-id-1928'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='693' column='1' id='type-id-2019'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='694' column='1' id='type-id-2020'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='695' column='1' id='type-id-1926'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-674' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='696' column='1' id='type-id-1924'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Block_pair' type-id='type-id-1955' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='724' column='1' id='type-id-2021'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_BPiter' type-id='type-id-1999' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/bitmap_allocator.h' line='727' column='1' id='type-id-2022'/>
           </member-type>
@@ -28253,17 +27638,13 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-2023' size-in-bits='832' id='type-id-2024'>
       <subrange length='13' type-id='type-id-174' id='type-id-2025'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='832' id='type-id-2026'>
       <subrange length='13' type-id='type-id-174' id='type-id-2025'/>
-
     </array-type-def>
     <class-decl name='__locale_struct' size-in-bits='1856' is-struct='yes' visibility='default' filepath='/usr/include/xlocale.h' line='28' column='1' id='type-id-2027'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -28325,21 +27706,18 @@ 
     <pointer-type-def type-id='type-id-2075' size-in-bits='64' id='type-id-2076'/>
     <pointer-type-def type-id='type-id-2050' size-in-bits='64' id='type-id-2077'/>
     <namespace-decl name='std'>
-
       <function-decl name='min&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1962'/>
         <parameter type-id='type-id-1962'/>
         <return type-id='type-id-1962'/>
       </function-decl>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='64' column='1' id='type-id-863'>
-
           <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-2078'>
               <underlying-type type-id='type-id-39'/>
               <enumerator name='_S_categories_size' value='12'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='facet' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='340' column='1' id='type-id-2075'>
               <data-member access='private' layout-offset-in-bits='64'>
@@ -28452,11 +27830,9 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='category' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='69' column='1' id='type-id-2083'/>
           </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-2084'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -28825,7 +28201,6 @@ 
               </member-function>
             </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-2050'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -29071,7 +28446,6 @@ 
       </class-decl>
       <typedef-decl name='__c_locale' type-id='type-id-2030' 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-2055'/>
       <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-2122'>
-
           <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-2123'>
               <underlying-type type-id='type-id-39'/>
@@ -29085,19 +28459,15 @@ 
       <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-2057'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2122'/>
-
           <member-type access='private'>
             <typedef-decl name='result' type-id='type-id-2123' 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-2124'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='intern_type' type-id='type-id-186' 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-2125'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='extern_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='76' column='1' id='type-id-2126'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='state_type' type-id='type-id-644' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='77' column='1' id='type-id-2127'/>
           </member-type>
@@ -29261,19 +28631,15 @@ 
       <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-2059'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2122'/>
-
           <member-type access='private'>
             <typedef-decl name='result' type-id='type-id-2123' 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-2138'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='intern_type' type-id='type-id-375' 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-2139'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='extern_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='76' column='1' id='type-id-2140'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='state_type' type-id='type-id-644' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='77' column='1' id='type-id-2141'/>
           </member-type>
@@ -29436,15 +28802,12 @@ 
       </class-decl>
       <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-1085'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2057'/>
-
           <member-type access='private'>
             <typedef-decl name='intern_type' type-id='type-id-186' 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-2037'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='extern_type' type-id='type-id-186' 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-2033'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='state_type' type-id='type-id-645' 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-2066'/>
           </member-type>
@@ -29572,15 +28935,12 @@ 
       </class-decl>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='399' column='1' id='type-id-1102'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2059'/>
-
           <member-type access='private'>
             <typedef-decl name='intern_type' type-id='type-id-375' 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-2046'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='extern_type' type-id='type-id-186' 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-2042'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='state_type' type-id='type-id-645' 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-2073'/>
           </member-type>
@@ -29733,8 +29093,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <class-decl name='__locale_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2031'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/complex_io.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'>
@@ -29743,11 +29101,9 @@ 
     <type-decl name='complex long double' size-in-bits='256' id='type-id-2154'/>
     <array-type-def dimensions='1' type-id='type-id-2091' size-in-bits='infinite' id='type-id-2087'>
       <subrange length='infinite' id='type-id-633'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2053' size-in-bits='infinite' id='type-id-2086'>
       <subrange length='infinite' id='type-id-633'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-2155'/>
     <qualified-type-def type-id='type-id-2155' const='yes' id='type-id-2119'/>
@@ -29823,14 +29179,11 @@ 
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-2120'/>
     <pointer-type-def type-id='type-id-2084' size-in-bits='64' id='type-id-2088'/>
     <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-913'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2162'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/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-2219'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__wmask_type' type-id='type-id-648' filepath='/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-2220'/>
           </member-type>
@@ -30178,7 +29531,6 @@ 
         <return type-id='type-id-359'/>
       </function-decl>
       <class-decl name='complex&lt;float&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1039' column='1' id='type-id-2183'>
-
           <member-type access='public'>
             <typedef-decl name='_ComplexT' type-id='type-id-2153' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1042' column='1' id='type-id-2187'/>
           </member-type>
@@ -30295,7 +29647,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='complex&lt;double&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/complex' line='1186' column='1' id='type-id-2177'>
-
           <member-type access='private'>
             <typedef-decl name='_ComplexT' type-id='type-id-2152' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1189' column='1' id='type-id-2181'/>
           </member-type>
@@ -30412,7 +29763,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='complex&lt;long double&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/complex' line='1334' column='1' id='type-id-2189'>
-
           <member-type access='private'>
             <typedef-decl name='_ComplexT' type-id='type-id-2154' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1337' column='1' id='type-id-2193'/>
           </member-type>
@@ -30560,7 +29910,6 @@ 
       </function-decl>
       <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-1320'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-711'/>
-
           <member-type access='private'>
             <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2231'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -30605,35 +29954,27 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='60' column='1' id='type-id-2235'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='61' column='1' id='type-id-2236'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='62' column='1' id='type-id-2237'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-869' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='63' column='1' id='type-id-2238'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ios_type' type-id='type-id-711' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='68' column='1' id='type-id-2239'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_put_type' type-id='type-id-854' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='71' column='1' id='type-id-2240'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/ostream' line='67' column='1' id='type-id-2241'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ostream_type' type-id='type-id-1320' 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-2204'/>
           </member-type>
@@ -30974,11 +30315,9 @@ 
       </function-decl>
       <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1322'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-714'/>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/ostream' line='67' column='1' id='type-id-2246'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2247'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -31023,31 +30362,24 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='60' column='1' id='type-id-2251'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='61' column='1' id='type-id-2252'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-926' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='62' column='1' id='type-id-2253'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-928' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='63' column='1' id='type-id-2254'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ios_type' type-id='type-id-714' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='68' column='1' id='type-id-2255'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__num_put_type' type-id='type-id-915' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='71' column='1' id='type-id-2256'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__ostream_type' type-id='type-id-1322' 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-2207'/>
           </member-type>
@@ -31440,7 +30772,6 @@ 
       <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-2162'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2261'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/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-2262'/>
           </member-type>
@@ -31673,31 +31004,24 @@ 
       </class-decl>
       <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='60' column='1' id='type-id-2171'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-733'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='64' column='1' id='type-id-2266'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='69' column='1' id='type-id-2267'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='70' column='1' id='type-id-2268'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-869' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='71' column='1' id='type-id-2269'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/sstream' line='73' column='1' id='type-id-2270'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-745' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='75' column='1' id='type-id-2271'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='74' column='1' id='type-id-2272'/>
           </member-type>
@@ -31835,11 +31159,9 @@ 
       </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-2165'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1320'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2171' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='388' column='1' id='type-id-2276'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-369' 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-2277'/>
           </member-type>
@@ -31957,31 +31279,24 @@ 
       </class-decl>
       <class-decl name='basic_stringbuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='60' column='1' id='type-id-2174'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-736'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='64' column='1' id='type-id-2280'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='69' column='1' id='type-id-2281'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pos_type' type-id='type-id-926' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='70' column='1' id='type-id-2282'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='off_type' type-id='type-id-928' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='71' column='1' id='type-id-2283'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__streambuf_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/sstream' line='73' column='1' id='type-id-2284'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-753' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='75' column='1' id='type-id-2285'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='74' column='1' id='type-id-2286'/>
           </member-type>
@@ -32119,11 +31434,9 @@ 
       </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-2168'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1322'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2174' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='388' column='1' id='type-id-2290'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-370' 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-2291'/>
           </member-type>
@@ -32260,7 +31573,6 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <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'>
     <pointer-type-def type-id='type-id-2294' size-in-bits='64' id='type-id-2295'/>
@@ -32303,50 +31615,39 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-2336' size-in-bits='64' id='type-id-2337'/>
     <pointer-type-def type-id='type-id-2338' size-in-bits='64' id='type-id-2339'/>
     <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-2340'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-347' 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-2341'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-349' 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-1122'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-4' 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-1126'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-674' 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-1124'/>
           </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-2342'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-347' 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-2343'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-349' 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-1140'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-354' 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-1144'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-785' 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-1142'/>
           </member-type>
       </class-decl>
       <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-2320'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2344'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='227' column='1' id='type-id-2332'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='ostream_type' type-id='type-id-1320' 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-2330'/>
           </member-type>
@@ -32414,11 +31715,9 @@ 
       <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-2344'/>
       <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-2324'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2344'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='227' column='1' id='type-id-2338'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='ostream_type' type-id='type-id-1322' 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-2336'/>
           </member-type>
@@ -33088,30 +32387,22 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='1024' id='type-id-2221'>
       <subrange length='128' type-id='type-id-174' id='type-id-2346'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2048' id='type-id-2347'>
       <subrange length='256' type-id='type-id-174' id='type-id-2348'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='8192' id='type-id-2222'>
       <subrange length='256' type-id='type-id-174' id='type-id-2348'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-51' size-in-bits='1024' id='type-id-2224'>
       <subrange length='16' type-id='type-id-174' id='type-id-1324'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='256' id='type-id-2223'>
       <subrange length='16' type-id='type-id-174' id='type-id-1324'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-852' const='yes' id='type-id-2349'/>
     <pointer-type-def type-id='type-id-2349' size-in-bits='64' id='type-id-2350'/>
@@ -33129,11 +32420,9 @@ 
     <pointer-type-def type-id='type-id-2225' size-in-bits='64' id='type-id-2227'/>
     <pointer-type-def type-id='type-id-2358' size-in-bits='64' id='type-id-2359'/>
     <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-852'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2261'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/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-2351'/>
           </member-type>
@@ -33447,11 +32736,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ctype_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='42' column='1' id='type-id-2261'>
-
           <member-type access='public'>
             <typedef-decl name='mask' type-id='type-id-634' 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-2225'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__to_type' type-id='type-id-1519' 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-2360'/>
           </member-type>
@@ -33530,14 +32817,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ext-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-470' size-in-bits='2944' id='type-id-2361'>
       <subrange length='46' type-id='type-id-174' id='type-id-2362'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-2363' size-in-bits='64' id='type-id-2364'/>
     <reference-type-def kind='lvalue' type-id='type-id-2365' size-in-bits='64' id='type-id-2366'/>
@@ -33621,7 +32904,6 @@ 
     <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-1109'/>
     <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1110'/>
     <qualified-type-def type-id='type-id-2475' volatile='yes' id='type-id-2476'/>
-
     <namespace-decl name='__gnu_cxx'>
       <namespace-decl name='__detail'>
         <enum-decl name='_Tag' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='72' column='1' id='type-id-2477'>
@@ -33632,10 +32914,8 @@ 
           <enumerator name='_S_function' value='3'/>
         </enum-decl>
       </namespace-decl>
-
       <class-decl name='stdio_filebuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='1920' visibility='default' 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='51' column='1' id='type-id-2427'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-696'/>
-
           <member-type access='private'>
             <typedef-decl name='size_t' type-id='type-id-94' 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='60' column='1' id='type-id-2478'/>
           </member-type>
@@ -33723,7 +33003,6 @@ 
       </class-decl>
       <class-decl name='stdio_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' 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='51' column='1' id='type-id-2425'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-693'/>
-
           <member-type access='private'>
             <typedef-decl name='size_t' type-id='type-id-94' 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='60' column='1' id='type-id-2480'/>
           </member-type>
@@ -33810,23 +33089,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='rope&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1522' column='1' id='type-id-2481'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2482'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeRep' type-id='type-id-2383' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1561' column='1' id='type-id-2421'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeConcatenation' type-id='type-id-2365' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1562' column='1' id='type-id-2483'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeLeaf' type-id='type-id-2377' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1563' column='1' id='type-id-2484'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeFunction' type-id='type-id-2371' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1564' column='1' id='type-id-2485'/>
           </member-type>
@@ -33844,7 +33118,6 @@ 
       <class-decl name='_Rope_RopeRep&lt;char, std::allocator&lt;char&gt; &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/ext/rope' line='583' column='1' id='type-id-2383'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2393'/>
         <base-class access='public' layout-offset-in-bits='64' type-id='type-id-2363'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2403' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='606' column='1' id='type-id-2386'/>
           </member-type>
@@ -33941,23 +33214,18 @@ 
       </class-decl>
       <class-decl name='_Rope_rep_base&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='549' column='1' id='type-id-2393'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-687' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='552' column='1' id='type-id-2403'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__C' type-id='type-id-2365' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2395'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__L' type-id='type-id-2377' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2399'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__F' type-id='type-id-2371' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2397'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__S' type-id='type-id-2486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2401'/>
           </member-type>
@@ -34058,7 +33326,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeConcatenation&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='1024' is-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/rope' line='755' column='1' id='type-id-2365'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2383'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2403' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='763' column='1' id='type-id-2431'/>
           </member-type>
@@ -34101,7 +33368,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeLeaf&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='960' is-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/rope' line='689' column='1' id='type-id-2377'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2383'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2403' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='722' column='1' id='type-id-2451'/>
           </member-type>
@@ -34147,7 +33413,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeFunction&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='1024' is-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/rope' line='791' column='1' id='type-id-2371'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2383'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2403' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='812' column='1' id='type-id-2441'/>
           </member-type>
@@ -34192,7 +33457,6 @@ 
       <class-decl name='char_producer&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-2417'/>
       <class-decl name='_Rope_RopeSubstring&lt;char, std::allocator&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2486'/>
       <class-decl name='_Refcount_Base' 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/ext/rope' line='454' column='1' id='type-id-2363'>
-
           <member-type access='public'>
             <typedef-decl name='_RC_t' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='457' column='1' id='type-id-2475'/>
           </member-type>
@@ -34223,23 +33487,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='rope&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1522' column='1' id='type-id-2487'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1527' column='1' id='type-id-2488'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeRep' type-id='type-id-2388' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1561' column='1' id='type-id-2423'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeConcatenation' type-id='type-id-2368' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1562' column='1' id='type-id-2489'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeLeaf' type-id='type-id-2380' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1563' column='1' id='type-id-2490'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_RopeFunction' type-id='type-id-2374' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='1564' column='1' id='type-id-2491'/>
           </member-type>
@@ -34257,7 +33516,6 @@ 
       <class-decl name='_Rope_RopeRep&lt;wchar_t, std::allocator&lt;wchar_t&gt; &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/ext/rope' line='583' column='1' id='type-id-2388'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2405'/>
         <base-class access='public' layout-offset-in-bits='64' type-id='type-id-2363'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='606' column='1' id='type-id-2391'/>
           </member-type>
@@ -34354,23 +33612,18 @@ 
       </class-decl>
       <class-decl name='_Rope_rep_base&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='549' column='1' id='type-id-2405'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-690'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-690' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='552' column='1' id='type-id-2415'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__C' type-id='type-id-2368' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2407'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__L' type-id='type-id-2380' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2411'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__F' type-id='type-id-2374' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2409'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__S' type-id='type-id-2492' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='578' column='1' id='type-id-2413'/>
           </member-type>
@@ -34471,7 +33724,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeConcatenation&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='1024' is-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/rope' line='755' column='1' id='type-id-2368'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2388'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='763' column='1' id='type-id-2436'/>
           </member-type>
@@ -34514,7 +33766,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeLeaf&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='960' is-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/rope' line='689' column='1' id='type-id-2380'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2388'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='722' column='1' id='type-id-2456'/>
           </member-type>
@@ -34560,7 +33811,6 @@ 
       </class-decl>
       <class-decl name='_Rope_RopeFunction&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='1024' is-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/rope' line='791' column='1' id='type-id-2374'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2388'/>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-2415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='812' column='1' id='type-id-2446'/>
           </member-type>
@@ -34605,32 +33855,22 @@ 
       <class-decl name='char_producer&lt;wchar_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-2419'/>
       <class-decl name='_Rope_RopeSubstring&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2492'/>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/globals_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='1920' id='type-id-2493'>
       <subrange length='240' type-id='type-id-174' id='type-id-2494'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2176' id='type-id-2495'>
       <subrange length='272' type-id='type-id-174' id='type-id-2496'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2240' id='type-id-2497'>
       <subrange length='280' type-id='type-id-174' id='type-id-2498'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='640' id='type-id-2499'>
       <subrange length='80' type-id='type-id-174' id='type-id-2500'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-2501' size-in-bits='64' id='type-id-2502'/>
     <namespace-decl name='std'>
-
       <typedef-decl name='fake_istream' type-id='type-id-2497' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='53' column='1' id='type-id-2503'/>
       <var-decl name='cin' type-id='type-id-2503' mangled-name='_ZSt3cin' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='57' column='1' elf-symbol-id='_ZSt3cin@@GLIBCXX_3.4'/>
       <typedef-decl name='fake_ostream' type-id='type-id-2495' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='55' column='1' id='type-id-2504'/>
@@ -34647,7 +33887,6 @@ 
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='stdio_sync_filebuf&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='57' column='1' id='type-id-2501'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-736'/>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' 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='63' column='1' id='type-id-2507'/>
           </member-type>
@@ -34764,7 +34003,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='__gnu_internal'>
       <typedef-decl name='fake_stdiobuf' type-id='type-id-2499' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='83' column='1' id='type-id-2509'/>
       <var-decl name='buf_cout_sync' type-id='type-id-2509' mangled-name='_ZN14__gnu_internal13buf_cout_syncE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='85' column='1'/>
@@ -34796,10 +34034,7 @@ 
     <qualified-type-def type-id='type-id-2525' const='yes' id='type-id-2526'/>
     <pointer-type-def type-id='type-id-2526' size-in-bits='64' id='type-id-2527'/>
     <namespace-decl name='std'>
-
       <namespace-decl name='tr1'>
-
-
         <class-decl name='_Fnv_hash_base&lt;8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='121' column='1' id='type-id-2528'>
           <member-function access='public' static='yes'>
             <function-decl name='hash&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tr1/functional_hash.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34873,14 +34108,10 @@ 
       <class-decl name='unary_function&lt;std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;, 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/bits/stl_function.h' line='103' column='1' id='type-id-2532'/>
       <class-decl name='unary_function&lt;const std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;&amp;, 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/bits/stl_function.h' line='103' column='1' id='type-id-2533'/>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hashtable_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'>
-
     <array-type-def dimensions='1' type-id='type-id-470' size-in-bits='19520' id='type-id-1721'>
       <subrange length='305' type-id='type-id-174' id='type-id-2534'/>
-
     </array-type-def>
     <namespace-decl name='std'>
       <namespace-decl name='tr1'>
@@ -34916,7 +34147,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-711' size-in-bits='64' id='type-id-865'/>
     <reference-type-def kind='lvalue' type-id='type-id-714' size-in-bits='64' id='type-id-924'/>
     <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-2350'/>
         <return type-id='type-id-2549'/>
@@ -34966,13 +34196,10 @@ 
         <return type-id='type-id-2544'/>
       </function-decl>
     </namespace-decl>
-
-
   </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'>
     <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='1024' id='type-id-904'>
       <subrange length='8' type-id='type-id-174' id='type-id-1832'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-2198' size-in-bits='64' id='type-id-910'/>
     <reference-type-def kind='lvalue' type-id='type-id-22' size-in-bits='64' id='type-id-908'/>
@@ -34983,7 +34210,6 @@ 
     <pointer-type-def type-id='type-id-2550' size-in-bits='64' id='type-id-885'/>
     <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-909'/>
     <namespace-decl name='std'>
-
       <function-decl name='__throw_ios_failure' mangled-name='_ZSt19__throw_ios_failurePKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functexcept.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__throw_ios_failurePKc@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4'/>
         <return type-id='type-id-5'/>
@@ -35065,8 +34291,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <function-type size-in-bits='64' id='type-id-2550'>
       <parameter type-id='type-id-883'/>
       <parameter type-id='type-id-911'/>
@@ -35078,9 +34302,6 @@ 
     <qualified-type-def type-id='type-id-887' const='yes' id='type-id-2552'/>
     <pointer-type-def type-id='type-id-2552' size-in-bits='64' id='type-id-889'/>
     <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-888'/>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-2553' size-in-bits='64' id='type-id-2554'/>
@@ -35094,7 +34315,6 @@ 
     <pointer-type-def type-id='type-id-2246' size-in-bits='64' id='type-id-2257'/>
     <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-893'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator|' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-899'/>
         <parameter type-id='type-id-899'/>
@@ -35115,7 +34335,6 @@ 
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='stdio_sync_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='57' column='1' id='type-id-2553'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-733'/>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' 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='63' column='1' id='type-id-2559'/>
           </member-type>
@@ -35232,18 +34451,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
   </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'>
     <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-2560'/>
     <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-2561'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_c' type-id='type-id-186' 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'/>
@@ -35350,8 +34563,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </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'>
     <qualified-type-def type-id='type-id-801' const='yes' id='type-id-2563'/>
@@ -35406,7 +34617,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-41' size-in-bits='64' id='type-id-1047'/>
     <reference-type-def kind='lvalue' type-id='type-id-634' size-in-bits='64' id='type-id-1045'/>
     <namespace-decl name='std'>
-
       <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='89' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-899'/>
         <return type-id='type-id-899'/>
@@ -35418,19 +34628,15 @@ 
       </function-decl>
       <class-decl name='istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-2573'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1073'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='69' column='1' id='type-id-2601'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-759' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-2610'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-2611'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='istream_type' type-id='type-id-801' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-2599'/>
           </member-type>
@@ -35509,19 +34715,15 @@ 
       </function-decl>
       <class-decl name='istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-2577'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1076'/>
-
           <member-type access='private'>
             <typedef-decl name='streambuf_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/streambuf_iterator.h' line='69' column='1' id='type-id-2607'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='int_type' type-id='type-id-766' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-2612'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-2613'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='istream_type' type-id='type-id-807' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-2605'/>
           </member-type>
@@ -35731,14 +34933,11 @@ 
     </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-2622'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-2623'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
-
     <function-type size-in-bits='64' id='type-id-2591'>
       <parameter type-id='type-id-2590'/>
       <return type-id='type-id-2590'/>
@@ -35767,7 +34966,6 @@ 
     <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1040'/>
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1065'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_' filepath='../../../.././libstdc++-v3/src/c++98/istream.cc' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-802'/>
         <parameter type-id='type-id-93'/>
@@ -35795,16 +34993,12 @@ 
         <return type-id='type-id-2549'/>
       </function-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/list.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'>
     <reference-type-def kind='lvalue' type-id='type-id-2626' size-in-bits='64' id='type-id-2627'/>
     <pointer-type-def type-id='type-id-2626' size-in-bits='64' id='type-id-2628'/>
     <reference-type-def kind='lvalue' type-id='type-id-2628' size-in-bits='64' id='type-id-2629'/>
     <namespace-decl name='std'>
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_base' 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/stl_list.h' line='78' column='1' id='type-id-2626'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -35855,24 +35049,16 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='88' id='type-id-2630'>
       <subrange length='11' type-id='type-id-174' id='type-id-2631'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='208' id='type-id-2632'>
       <subrange length='26' type-id='type-id-174' id='type-id-2633'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='288' id='type-id-2634'>
       <subrange length='36' type-id='type-id-174' id='type-id-2635'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-2057' const='yes' id='type-id-2636'/>
     <pointer-type-def type-id='type-id-2636' size-in-bits='64' id='type-id-2128'/>
@@ -35960,7 +35146,6 @@ 
     <pointer-type-def type-id='type-id-2741' size-in-bits='64' id='type-id-2742'/>
     <pointer-type-def type-id='type-id-2743' size-in-bits='64' id='type-id-2744'/>
     <namespace-decl name='std'>
-
       <function-decl name='__iterator_category&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_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-676'/>
         <return type-id='type-id-2341'/>
@@ -36107,7 +35292,6 @@ 
       <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-2639'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2261'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/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-2642'/>
           </member-type>
@@ -36726,7 +35910,6 @@ 
         <return type-id='type-id-2030'/>
       </function-decl>
     </namespace-decl>
-
     <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-4'/>
       <return type-id='type-id-93'/>
@@ -36736,18 +35919,14 @@ 
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-93'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-673' size-in-bits='16' id='type-id-2079'>
       <subrange length='2' type-id='type-id-174' id='type-id-2749'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-2201' size-in-bits='64' id='type-id-2081'/>
     <reference-type-def kind='lvalue' type-id='type-id-2075' size-in-bits='64' id='type-id-2082'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator==&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2490' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-740'/>
         <parameter type-id='type-id-740'/>
@@ -36760,14 +35939,11 @@ 
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__enable_if&lt;true, 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/ext/type_traits.h' line='47' column='1' id='type-id-2751'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-42' 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-2750'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
-
     <function-decl name='strcmp' filepath='/usr/include/string.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
@@ -36775,17 +35951,13 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-2752'>
       <subrange length='14' type-id='type-id-174' id='type-id-2753'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-354' size-in-bits='896' id='type-id-2754'>
       <subrange length='14' type-id='type-id-174' id='type-id-2753'/>
-
     </array-type-def>
     <namespace-decl name='std'>
-
       <function-decl name='operator&amp;' 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='77' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-899'/>
         <parameter type-id='type-id-899'/>
@@ -36814,8 +35986,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-2756' const='yes' id='type-id-2757'/>
@@ -36858,7 +36028,6 @@ 
     <pointer-type-def type-id='type-id-2714' size-in-bits='64' id='type-id-2103'/>
     <pointer-type-def type-id='type-id-2791' size-in-bits='64' id='type-id-2116'/>
     <namespace-decl name='std'>
-
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&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_string.h' line='2553' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-740'/>
         <parameter type-id='type-id-4'/>
@@ -36870,7 +36039,6 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
       <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-2792'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-2793'>
               <underlying-type type-id='type-id-39'/>
@@ -36879,7 +36047,6 @@ 
               <enumerator name='_S_end' value='11'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='pattern' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='844' column='1' id='type-id-2756'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -36887,7 +36054,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-2794'>
               <underlying-type type-id='type-id-39'/>
@@ -36914,7 +36080,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='time_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='52' column='1' id='type-id-2795'>
-
           <member-type access='private'>
             <enum-decl name='dateorder' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='55' column='1' id='type-id-2796'>
               <underlying-type type-id='type-id-39'/>
@@ -37023,11 +36188,9 @@ 
       </class-decl>
       <class-decl name='num_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-856'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2573' filepath='/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-2797'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/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-2704'/>
           </member-type>
@@ -37400,11 +36563,9 @@ 
       </class-decl>
       <class-decl name='num_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-854'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/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-2799'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2320' filepath='/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-2800'/>
           </member-type>
@@ -37709,15 +36870,12 @@ 
       </class-decl>
       <class-decl name='money_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-2681'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/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-2685'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2573' filepath='/tmp/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-2801'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/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-2732'/>
           </member-type>
@@ -37832,15 +36990,12 @@ 
       </class-decl>
       <class-decl name='money_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-2687'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/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-2691'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2320' filepath='/tmp/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-2802'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/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-2693'/>
           </member-type>
@@ -37950,11 +37105,9 @@ 
       <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-2708'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2795'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/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-2712'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2573' filepath='/tmp/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-2803'/>
           </member-type>
@@ -38173,11 +37326,9 @@ 
       </class-decl>
       <class-decl name='time_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-2714'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/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-2804'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2320' filepath='/tmp/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-2805'/>
           </member-type>
@@ -38353,11 +37504,9 @@ 
       </class-decl>
       <class-decl name='num_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-917'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2577' filepath='/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-2810'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/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-2811'/>
           </member-type>
@@ -38730,11 +37879,9 @@ 
       </class-decl>
       <class-decl name='num_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-915'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2324' filepath='/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-2812'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/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-2813'/>
           </member-type>
@@ -39039,15 +38186,12 @@ 
       </class-decl>
       <class-decl name='money_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-2774'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/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-2815'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2577' filepath='/tmp/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-2816'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/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-2817'/>
           </member-type>
@@ -39162,15 +38306,12 @@ 
       </class-decl>
       <class-decl name='money_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-2775'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/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-2820'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2324' filepath='/tmp/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-2821'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/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-2822'/>
           </member-type>
@@ -39280,11 +38421,9 @@ 
       <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-2790'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2795'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/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-2825'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2577' filepath='/tmp/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-2826'/>
           </member-type>
@@ -39503,11 +38642,9 @@ 
       </class-decl>
       <class-decl name='time_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-2791'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/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-2828'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iter_type' type-id='type-id-2324' filepath='/tmp/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-2829'/>
           </member-type>
@@ -39588,15 +38725,12 @@ 
       </class-decl>
       <class-decl name='numpunct&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-2583'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2653' filepath='/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-2786'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1650' column='1' id='type-id-2831'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/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-2832'/>
           </member-type>
@@ -39743,7 +38877,6 @@ 
       </class-decl>
       <class-decl name='collate&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-2746'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/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-2673'/>
           </member-type>
@@ -39877,15 +39010,12 @@ 
       <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-2696'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2792'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-2834'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/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-2835'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2645' filepath='/tmp/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-2776'/>
           </member-type>
@@ -40194,15 +39324,12 @@ 
       <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-2700'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2792'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-2836'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/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-2837'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2649' filepath='/tmp/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-2778'/>
           </member-type>
@@ -40510,7 +39637,6 @@ 
       </class-decl>
       <class-decl name='__timepunct&lt;char&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-2767'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2659' filepath='/tmp/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-2723'/>
           </member-type>
@@ -40679,7 +39805,6 @@ 
       <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-2747'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2839'/>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-369' filepath='/tmp/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-2678'/>
           </member-type>
@@ -40821,15 +39946,12 @@ 
       </class-decl>
       <class-decl name='numpunct&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-2586'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2765' filepath='/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-2788'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1650' column='1' id='type-id-2842'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/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-2843'/>
           </member-type>
@@ -40976,7 +40098,6 @@ 
       </class-decl>
       <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-2772'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/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-2844'/>
           </member-type>
@@ -41110,15 +40231,12 @@ 
       <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-2780'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2792'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-2846'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/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-2847'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2760' filepath='/tmp/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-2781'/>
           </member-type>
@@ -41427,15 +40545,12 @@ 
       <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-2783'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2792'/>
-
           <member-type access='private'>
             <typedef-decl name='char_type' type-id='type-id-375' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-2852'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/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-2853'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2762' filepath='/tmp/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-2784'/>
           </member-type>
@@ -41743,7 +40858,6 @@ 
       </class-decl>
       <class-decl name='__timepunct&lt;wchar_t&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-2768'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
-
           <member-type access='private'>
             <typedef-decl name='__cache_type' type-id='type-id-2770' filepath='/tmp/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-2857'/>
           </member-type>
@@ -41912,7 +41026,6 @@ 
       <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-2773'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2075'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2839'/>
-
           <member-type access='private'>
             <typedef-decl name='string_type' type-id='type-id-370' filepath='/tmp/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-2860'/>
           </member-type>
@@ -42465,13 +41578,9 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/localename.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'>
     <reference-type-def kind='lvalue' type-id='type-id-273' size-in-bits='64' id='type-id-1815'/>
-
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='operator-&lt;char*, std::basic_string&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/stl_iterator.h' line='898' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1815'/>
@@ -42479,22 +41588,16 @@ 
         <return type-id='type-id-275'/>
       </function-decl>
     </namespace-decl>
-
   </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'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_long_double.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/misc-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-2559' const='yes' id='type-id-2865'/>
     <qualified-type-def type-id='type-id-2507' const='yes' id='type-id-2866'/>
     <qualified-type-def type-id='type-id-2479' const='yes' id='type-id-2508'/>
     <namespace-decl name='std'>
-
       <function-decl name='getline&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-802'/>
         <parameter type-id='type-id-819'/>
@@ -42511,9 +41614,6 @@ 
         <return type-id='type-id-808'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <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-185'/>
       <parameter type-id='type-id-643'/>
@@ -42574,10 +41674,8 @@ 
     <pointer-type-def type-id='type-id-2914' size-in-bits='64' id='type-id-2916'/>
     <qualified-type-def type-id='type-id-2900' const='yes' id='type-id-2917'/>
     <reference-type-def kind='lvalue' type-id='type-id-2917' size-in-bits='64' id='type-id-2918'/>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__pool_base' size-in-bits='576' is-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/mt_allocator.h' line='49' column='1' id='type-id-2893'>
-
           <member-type access='public'>
             <class-decl name='_Tune' 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/ext/mt_allocator.h' line='57' column='1' id='type-id-2900'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -42622,7 +41720,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Block_address' 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/ext/mt_allocator.h' line='128' column='1' id='type-id-2898'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -42633,7 +41730,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Binmap_type' type-id='type-id-634' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='53' column='1' id='type-id-2896'/>
           </member-type>
@@ -42709,7 +41805,6 @@ 
       </class-decl>
       <class-decl name='__pool&lt;true&gt;' size-in-bits='832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='261' column='1' id='type-id-2884'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2893'/>
-
           <member-type access='private'>
             <class-decl name='_Thread_record' 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/ext/mt_allocator.h' line='273' column='1' id='type-id-2891'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -42720,7 +41815,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <union-decl name='_Block_record' 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/ext/mt_allocator.h' line='282' column='1' id='type-id-2888'>
               <data-member access='private'>
@@ -42731,7 +41825,6 @@ 
               </data-member>
             </union-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Bin_record' 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/ext/mt_allocator.h' line='291' column='1' id='type-id-2886'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -42849,23 +41942,18 @@ 
       </class-decl>
       <typedef-decl name='__destroy_handler' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='46' column='1' id='type-id-2919'/>
       <class-decl name='__mt_alloc_base&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/ext/mt_allocator.h' line='568' column='1' id='type-id-2873'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2920'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='573' column='1' id='type-id-2921'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='574' column='1' id='type-id-2922'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='575' column='1' id='type-id-2923'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-674' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='576' column='1' id='type-id-2924'/>
           </member-type>
@@ -42906,23 +41994,18 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__mt_alloc_base&lt;wchar_t&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/ext/mt_allocator.h' line='568' column='1' id='type-id-2875'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='571' column='1' id='type-id-2925'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='573' column='1' id='type-id-2926'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='574' column='1' id='type-id-2927'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='575' column='1' id='type-id-2928'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-785' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='576' column='1' id='type-id-2929'/>
           </member-type>
@@ -42963,7 +42046,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__common_pool&lt;__gnu_cxx::__pool, 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/ext/mt_allocator.h' line='389' column='1' id='type-id-2930'>
-
           <member-type access='public'>
             <typedef-decl name='pool_type' type-id='type-id-2884' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='391' column='1' id='type-id-2867'/>
           </member-type>
@@ -42988,7 +42070,6 @@ 
       </class-decl>
       <class-decl name='__pool&lt;false&gt;' 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/ext/mt_allocator.h' line='194' column='1' id='type-id-2877'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2893'/>
-
           <member-type access='private'>
             <union-decl name='_Block_record' 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/ext/mt_allocator.h' line='197' column='1' id='type-id-2881'>
               <data-member access='private'>
@@ -42996,7 +42077,6 @@ 
               </data-member>
             </union-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Bin_record' 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/ext/mt_allocator.h' line='203' column='1' id='type-id-2879'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -43085,15 +42165,12 @@ 
       </class-decl>
       <class-decl name='__mt_alloc&lt;char, __gnu_cxx::__common_pool_policy&lt;__gnu_cxx::__pool, true&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/ext/mt_allocator.h' line='631' column='1' id='type-id-2869'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2873'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2932'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='636' column='1' id='type-id-2933'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pool_type' type-id='type-id-2867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='642' column='1' id='type-id-2934'/>
           </member-type>
@@ -43169,15 +42246,12 @@ 
       </class-decl>
       <class-decl name='__mt_alloc&lt;wchar_t, __gnu_cxx::__common_pool_policy&lt;__gnu_cxx::__pool, true&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/ext/mt_allocator.h' line='631' column='1' id='type-id-2871'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2875'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='634' column='1' id='type-id-2935'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='636' column='1' id='type-id-2936'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pool_type' type-id='type-id-2867' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='642' column='1' id='type-id-2937'/>
           </member-type>
@@ -43252,7 +42326,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ostream-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-2240' const='yes' id='type-id-2938'/>
@@ -43281,7 +42354,6 @@ 
     <pointer-type-def type-id='type-id-2953' size-in-bits='64' id='type-id-2258'/>
     <pointer-type-def type-id='type-id-2247' size-in-bits='64' id='type-id-2249'/>
     <namespace-decl name='std'>
-
       <function-decl name='__ostream_write&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='44' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2203'/>
         <parameter type-id='type-id-4'/>
@@ -43455,9 +42527,6 @@ 
         <return type-id='type-id-2206'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <function-type size-in-bits='64' id='type-id-2949'>
       <parameter type-id='type-id-2948'/>
       <return type-id='type-id-2948'/>
@@ -43481,8 +42550,6 @@ 
     <pointer-type-def type-id='type-id-2956' size-in-bits='64' id='type-id-2958'/>
     <qualified-type-def type-id='type-id-2956' const='yes' id='type-id-2959'/>
     <reference-type-def kind='lvalue' type-id='type-id-2959' size-in-bits='64' id='type-id-2960'/>
-
-
     <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-2956'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -43693,13 +42760,10 @@ 
       </enum-decl>
       <typedef-decl name='_SequenceIndex' type-id='type-id-2955' 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-2967'/>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/pool_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-2968' size-in-bits='1024' id='type-id-2969'>
       <subrange length='16' type-id='type-id-174' id='type-id-1324'/>
-
     </array-type-def>
     <pointer-type-def type-id='type-id-2970' size-in-bits='64' id='type-id-2971'/>
     <pointer-type-def type-id='type-id-2972' size-in-bits='64' id='type-id-2973'/>
@@ -43718,31 +42782,26 @@ 
     <qualified-type-def type-id='type-id-2989' const='yes' id='type-id-2990'/>
     <qualified-type-def type-id='type-id-2991' const='yes' id='type-id-2992'/>
     <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1046'/>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__pool_alloc_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='77' column='1' id='type-id-2974'>
-
           <member-type access='protected'>
             <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/ext/pool_allocator.h' line='81' column='1' id='type-id-2993'>
               <underlying-type type-id='type-id-39'/>
               <enumerator name='_S_align' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='82' column='1' id='type-id-2994'>
               <underlying-type type-id='type-id-39'/>
               <enumerator name='_S_max_bytes' value='128'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='83' column='1' id='type-id-2995'>
               <underlying-type type-id='type-id-39'/>
               <enumerator name='_S_free_list_size' value='16'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <union-decl name='_Obj' 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/ext/pool_allocator.h' line='85' column='1' id='type-id-2976'>
               <data-member access='private'>
@@ -43803,23 +42862,18 @@ 
       </class-decl>
       <class-decl name='__pool_alloc&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/ext/pool_allocator.h' line='125' column='1' id='type-id-2970'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-2974'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2996'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-93' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='133' column='1' id='type-id-2997'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-4' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='134' column='1' id='type-id-2998'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-352' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='135' column='1' id='type-id-2984'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-674' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='136' column='1' id='type-id-2982'/>
           </member-type>
@@ -43920,23 +42974,18 @@ 
       </class-decl>
       <class-decl name='__pool_alloc&lt;wchar_t&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/ext/pool_allocator.h' line='125' column='1' id='type-id-2972'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-2974'/>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-94' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='131' column='1' id='type-id-2999'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-333' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='133' column='1' id='type-id-3000'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_pointer' type-id='type-id-354' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='134' column='1' id='type-id-3001'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-362' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='135' column='1' id='type-id-2991'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-785' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='136' column='1' id='type-id-2989'/>
           </member-type>
@@ -44036,7 +43085,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/sstream-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-3002' const='yes' id='type-id-3003'/>
@@ -44084,7 +43132,6 @@ 
     <pointer-type-def type-id='type-id-3030' size-in-bits='64' id='type-id-3045'/>
     <pointer-type-def type-id='type-id-3046' size-in-bits='64' id='type-id-3047'/>
     <namespace-decl name='std'>
-
       <function-decl name='max&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1962'/>
         <parameter type-id='type-id-1962'/>
@@ -44092,11 +43139,9 @@ 
       </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-3024'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1319'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2171' 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-3043'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-369' 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-3027'/>
           </member-type>
@@ -44214,11 +43259,9 @@ 
       </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-3008'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2174' 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-3040'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-370' 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-3011'/>
           </member-type>
@@ -44336,11 +43379,9 @@ 
       </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-3002'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-801'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2171' 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-3037'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-369' 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-3005'/>
           </member-type>
@@ -44458,11 +43499,9 @@ 
       </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-3030'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1321'/>
-
           <member-type access='private'>
             <typedef-decl name='__stringbuf_type' type-id='type-id-2174' 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-3046'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__string_type' type-id='type-id-370' 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-3033'/>
           </member-type>
@@ -44579,8 +43618,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-1545' const='yes' id='type-id-3048'/>
@@ -44597,7 +43634,6 @@ 
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-3065'/>
     <pointer-type-def type-id='type-id-3066' size-in-bits='64' id='type-id-3067'/>
     <namespace-decl name='std'>
-
       <class-decl name='logic_error' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/stdexcept' line='56' column='1' id='type-id-1545'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-11'/>
         <data-member access='private' layout-offset-in-bits='64'>
@@ -44959,8 +43995,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </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-870' const='yes' id='type-id-3068'/>
@@ -44973,9 +44007,6 @@ 
     <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-876'/>
     <reference-type-def kind='lvalue' type-id='type-id-929' size-in-bits='64' id='type-id-934'/>
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-932'/>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-42' size-in-bits='64' id='type-id-577'/>
@@ -44984,7 +44015,6 @@ 
     <qualified-type-def type-id='type-id-817' const='yes' id='type-id-3073'/>
     <pointer-type-def type-id='type-id-3073' size-in-bits='64' id='type-id-931'/>
     <namespace-decl name='std'>
-
       <function-decl name='__copy_streambufs_eof&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb' filepath='../../../.././libstdc++-v3/src/c++98/streambuf.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb@@GLIBCXX_3.4.9'>
         <parameter type-id='type-id-813'/>
         <parameter type-id='type-id-813'/>
@@ -44998,8 +44028,6 @@ 
         <return type-id='type-id-872'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/strstream.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-631' const='yes' id='type-id-3074'/>
@@ -45027,7 +44055,6 @@ 
     <pointer-type-def type-id='type-id-3086' size-in-bits='64' id='type-id-3097'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-2615'/>
     <namespace-decl name='std'>
-
       <function-decl name='max&lt;long int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-680'/>
         <parameter type-id='type-id-680'/>
@@ -45874,8 +44901,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-3098'/>
@@ -45885,7 +44910,6 @@ 
     <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1507'/>
     <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-3102'/>
     <namespace-decl name='std'>
-
       <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-3099'>
         <underlying-type type-id='type-id-39'/>
         <enumerator name='_S_red' value='0'/>
@@ -45897,11 +44921,9 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='90' column='1' id='type-id-1504'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1507' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='92' column='1' id='type-id-1525'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-1509' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='93' column='1' id='type-id-1530'/>
           </member-type>
@@ -45986,8 +45008,6 @@ 
         <return type-id='type-id-41'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.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'>
     <pointer-type-def type-id='type-id-3103' size-in-bits='64' id='type-id-3104'/>
@@ -46056,7 +45076,6 @@ 
     <pointer-type-def type-id='type-id-3183' size-in-bits='64' id='type-id-3184'/>
     <reference-type-def kind='lvalue' type-id='type-id-51' size-in-bits='64' id='type-id-1048'/>
     <namespace-decl name='std'>
-
       <function-decl name='__valarray_product&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3161'/>
         <parameter type-id='type-id-3161'/>
@@ -46087,37 +45106,29 @@ 
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='valarray&lt;long unsigned int&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='118' column='1' id='type-id-3156'>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__unary_plus&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3185'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3187' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3186'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__negate&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3188'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3190' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3189'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__bitwise_not&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3191'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3193' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3192'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__logical_not&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3194'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3196' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3195'/>
                 </member-type>
@@ -47054,37 +46065,29 @@ 
         </member-function>
       </class-decl>
       <class-decl name='valarray&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='118' column='1' id='type-id-3152'>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__unary_plus&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3202'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3204' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3203'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__negate&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3205'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3207' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3206'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__bitwise_not&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3208'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3210' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3209'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_UnaryOp&lt;std::__logical_not&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='121' column='1' id='type-id-3211'>
-
                 <member-type access='public'>
                   <typedef-decl name='_Rt' type-id='type-id-3213' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='124' column='1' id='type-id-3212'/>
                 </member-type>
@@ -47515,7 +46518,6 @@ 
       <class-decl name='_Expr&lt;std::_SClos&lt;std::_ValArray, bool&gt;, bool&gt;' visibility='default' is-declaration-only='yes' id='type-id-3214'/>
       <class-decl name='_Expr&lt;std::_GClos&lt;std::_ValArray, bool&gt;, bool&gt;' visibility='default' is-declaration-only='yes' id='type-id-3215'/>
       <class-decl name='gslice' 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/gslice.h' line='65' column='1' id='type-id-3116'>
-
           <member-type access='private'>
             <class-decl name='_Indexer' size-in-bits='512' is-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/gslice.h' line='107' column='1' id='type-id-3166'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -47818,8 +46820,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <function-type size-in-bits='64' id='type-id-3103'>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-42'/>
@@ -47840,15 +46840,12 @@ 
   <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'>
     <array-type-def dimensions='1' type-id='type-id-375' size-in-bits='352' id='type-id-2849'>
       <subrange length='11' type-id='type-id-174' id='type-id-2631'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-375' size-in-bits='832' id='type-id-2807'>
       <subrange length='26' type-id='type-id-174' id='type-id-2633'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-375' size-in-bits='1152' id='type-id-2806'>
       <subrange length='36' type-id='type-id-174' id='type-id-2635'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-2059' const='yes' id='type-id-3222'/>
     <pointer-type-def type-id='type-id-3222' size-in-bits='64' id='type-id-2142'/>
@@ -47928,7 +46925,6 @@ 
     <pointer-type-def type-id='type-id-3280' size-in-bits='64' id='type-id-3281'/>
     <pointer-type-def type-id='type-id-3282' size-in-bits='64' id='type-id-3283'/>
     <namespace-decl name='std'>
-
       <function-decl name='__iterator_category&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_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-787'/>
         <return type-id='type-id-2343'/>
@@ -48448,8 +47444,6 @@ 
         <return type-id='type-id-42'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='atomicity.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-537' volatile='yes' id='type-id-3285'/>
@@ -48468,10 +47462,8 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='basic_file.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='192' id='type-id-3287'>
       <subrange length='3' type-id='type-id-174' id='type-id-3288'/>
-
     </array-type-def>
     <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/uio.h' line='44' column='1' id='type-id-3289'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -48565,7 +47557,6 @@ 
     <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-3308'/>
     <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-3309'/>
     <namespace-decl name='std'>
-
       <class-decl name='numeric_limits&lt;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='1121' column='1' id='type-id-3310'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-243' mangled-name='_ZNSt14numeric_limitsIlE14is_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='1123' column='1' elf-symbol-id='_ZNSt14numeric_limitsIlE14is_specializedE@@GLIBCXX_3.4'/>
@@ -48775,9 +47766,6 @@ 
       </class-decl>
       <typedef-decl name='__c_lock' type-id='type-id-70' 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-1090'/>
     </namespace-decl>
-
-
-
     <function-decl name='__errno_location' filepath='/usr/include/bits/errno.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-109'/>
     </function-decl>
@@ -48837,7 +47825,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-3311' size-in-bits='64' id='type-id-2745'/>
     <reference-type-def kind='lvalue' type-id='type-id-861' size-in-bits='64' id='type-id-2798'/>
     <namespace-decl name='std'>
-
       <function-decl name='__convert_to_v&lt;float&gt;' mangled-name='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4'/>
         <parameter type-id='type-id-1036'/>
@@ -49103,8 +48090,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <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-4'/>
       <parameter type-id='type-id-272'/>
@@ -49139,9 +48124,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='codecvt_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
     <function-decl name='wcsnrtombs' filepath='/usr/include/wchar.h' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-788'/>
@@ -49171,9 +48153,6 @@ 
     <pointer-type-def type-id='type-id-2671' size-in-bits='64' id='type-id-2833'/>
     <qualified-type-def type-id='type-id-2772' const='yes' id='type-id-3244'/>
     <pointer-type-def type-id='type-id-3244' size-in-bits='64' id='type-id-2845'/>
-
-
-
     <function-decl name='__strcoll_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
@@ -49202,14 +48181,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='ctype_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-3315' size-in-bits='64' id='type-id-3316'/>
     <namespace-decl name='std'>
-
       <class-decl name='ctype_byname&lt;char&gt;' size-in-bits='4608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1484' column='1' id='type-id-3315'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-852'/>
         <member-function access='private'>
@@ -49251,8 +48226,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <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-4'/>
       <parameter type-id='type-id-2030'/>
@@ -49291,16 +48264,12 @@ 
     <qualified-type-def type-id='type-id-2860' const='yes' id='type-id-3317'/>
     <reference-type-def kind='lvalue' type-id='type-id-3317' size-in-bits='64' id='type-id-2862'/>
     <namespace-decl name='std'>
-
       <class-decl name='messages_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1668' column='1' id='type-id-2839'>
-
           <member-type access='public'>
             <typedef-decl name='catalog' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1670' column='1' id='type-id-2841'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
-
     <function-decl name='gettext' filepath='/usr/include/libintl.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-93'/>
@@ -49308,9 +48277,6 @@ 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <typedef-decl name='nl_item' type-id='type-id-6' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-3318'/>
-
-
-
     <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-3318'/>
       <parameter type-id='type-id-2030'/>
@@ -49318,18 +48284,12 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='time_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-2767' const='yes' id='type-id-2657'/>
     <pointer-type-def type-id='type-id-2657' size-in-bits='64' id='type-id-2838'/>
     <qualified-type-def type-id='type-id-2768' const='yes' id='type-id-3232'/>
     <pointer-type-def type-id='type-id-3232' size-in-bits='64' id='type-id-2859'/>
-
-
-
     <function-decl name='__strftime_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-92'/>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index 45cf3717..a5f3ff6c 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -3,45 +3,30 @@ 
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' id='type-id-3'>
       <subrange length='7' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8' id='type-id-6'>
       <subrange length='1' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' id='type-id-8'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='type-id-10'/>
     <array-type-def dimensions='2' type-id='type-id-10' size-in-bits='960' id='type-id-11'>
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
       <subrange length='3' type-id='type-id-4' id='type-id-13'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
       <subrange length='4' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
       <subrange length='10' type-id='type-id-4' id='type-id-20'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
     </array-type-def>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
     <class-decl name='S' size-in-bits='2304' is-struct='yes' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='1' column='1' id='type-id-22'>
diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi
index a04025f6..a21810fe 100644
--- a/tests/data/test-read-dwarf/test7.so.hash.abi
+++ b/tests/data/test-read-dwarf/test7.so.hash.abi
@@ -3,45 +3,30 @@ 
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <type-decl name='char' size-in-bits='8' id='a84c031d'/>
     <array-type-def dimensions='1' type-id='26a90f95' size-in-bits='448' id='0626c76e'>
       <subrange length='7' type-id='4c87fef4' id='16fc326e'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='8' id='89feb1ec'>
       <subrange length='1' type-id='4c87fef4' id='52f813b4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='infinite' id='e84913bd'>
       <subrange length='infinite' type-id='4c87fef4' id='031f2035'/>
-
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='a0eb0f08'/>
     <array-type-def dimensions='2' type-id='a0eb0f08' size-in-bits='960' id='9ba86d8c'>
       <subrange length='5' type-id='4c87fef4' id='53010e10'/>
-
       <subrange length='3' type-id='4c87fef4' id='56f209d2'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='95e97e5e'/>
     <array-type-def dimensions='1' type-id='7292109c' size-in-bits='256' id='5abcdf1a'>
       <subrange length='4' type-id='4c87fef4' id='16fe7105'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='07535890' size-in-bits='640' id='bea34bd7'>
       <subrange length='10' type-id='4c87fef4' id='487da03a'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='160' id='e41e1db9'>
       <subrange length='5' type-id='4c87fef4' id='53010e10'/>
-
     </array-type-def>
     <type-decl name='sizetype' size-in-bits='64' id='4c87fef4'/>
     <class-decl name='S' size-in-bits='2304' is-struct='yes' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='1' column='1' id='50d9a3fa'>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index 60d37804..2842dd1e 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -347,12 +347,10 @@ 
     <elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -523,7 +521,6 @@ 
       </namespace-decl>
       <namespace-decl name='system'>
         <class-decl name='error_condition' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='230' column='1' id='type-id-61'>
-
             <member-type access='private'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-111' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='272' column='1' id='type-id-117'/>
             </member-type>
@@ -664,7 +661,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='error_code' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='317' column='1' id='type-id-59'>
-
             <member-type access='private'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-111' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-119'/>
             </member-type>
@@ -781,17 +777,12 @@ 
         </class-decl>
       </namespace-decl>
       <typedef-decl name='noncopyable' type-id='type-id-54' filepath='src/third_party/boost-1.56.0/boost/core/noncopyable.hpp' line='44' column='1' id='type-id-120'/>
-
     </namespace-decl>
     <namespace-decl name='std'>
-
-
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-121'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-123' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' 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/basic_string.h' line='155' column='1' id='type-id-124'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-125'/>
@@ -892,7 +883,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' 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/basic_string.h' line='148' column='1' id='type-id-125'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -1019,7 +1009,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-18'/>
     </function-decl>
@@ -1529,7 +1518,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-36'/>
@@ -1971,18 +1959,14 @@ 
     <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-38' visibility='default' is-declaration-only='yes' id='type-id-40'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='infinite' id='type-id-139'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-140'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-141' size-in-bits='infinite' id='type-id-142'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-140'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-122' size-in-bits='infinite' id='type-id-127'>
       <subrange length='infinite' type-id='type-id-4' id='type-id-140'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-143'/>
     <typedef-decl name='_Atomic_word' type-id='type-id-11' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h' line='32' column='1' id='type-id-132'/>
@@ -2357,15 +2341,12 @@ 
           </function-decl>
         </namespace-decl>
         <class-decl name='path' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='55' column='1' id='type-id-187'>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='66' column='1' id='type-id-265'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='string_type' type-id='type-id-121' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='69' column='1' id='type-id-262'/>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='iterator' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='569' column='1' id='type-id-190'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-199'/>
@@ -2405,7 +2386,6 @@ 
                 </member-function>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='codecvt_type' type-id='type-id-335' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='71' column='1' id='type-id-256'/>
             </member-type>
@@ -3177,7 +3157,6 @@ 
         </enum-decl>
         <class-decl name='filesystem_error' size-in-bits='448' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='64' column='1' id='type-id-181'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-217'/>
-
             <member-type access='private'>
               <class-decl name='m_imp' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='159' column='1' id='type-id-183'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -3461,7 +3440,6 @@ 
         </function-decl>
       </namespace-decl>
       <namespace-decl name='system'>
-
         <function-decl name='system_category' mangled-name='_ZN5boost6system15system_categoryEv' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
           <return type-id='type-id-73'/>
         </function-decl>
@@ -3543,7 +3521,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-210'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-342' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-214'/>
           </member-type>
@@ -3691,14 +3668,12 @@ 
         </member-function>
       </class-decl>
       <namespace-decl name='detail'>
-
         <function-decl name='atomic_exchange_and_add' mangled-name='_ZN5boost6detail23atomic_exchange_and_addEPii' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail23atomic_exchange_and_addEPii'>
           <parameter type-id='type-id-323' name='pw' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp' line='35' column='1'/>
           <parameter type-id='type-id-11' name='dv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp' line='35' column='1'/>
           <return type-id='type-id-11'/>
         </function-decl>
         <class-decl name='sp_element&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-347'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-169' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-348'/>
             </member-type>
@@ -3977,19 +3952,16 @@ 
         </class-decl>
         <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/shared_count.hpp' line='60' column='1' id='type-id-349'/>
         <class-decl name='sp_dereference&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-351'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-170' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-352'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-353'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-171' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-354'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='162' column='1' id='type-id-355'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='164' column='1' id='type-id-356'/>
             </member-type>
@@ -4011,31 +3983,26 @@ 
           <return type-id='type-id-18'/>
         </function-decl>
         <class-decl name='sp_element&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-357'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-183' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-342'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-358'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-184' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-343'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-359'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-185' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-344'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='162' column='1' id='type-id-360'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='164' column='1' id='type-id-346'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_arrow_dispatch&lt;const boost::filesystem::path &amp;, const boost::filesystem::path *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-361'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-255' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-362'/>
             </member-type>
@@ -4047,14 +4014,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::path::iterator, const boost::filesystem::path, const boost::filesystem::path &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-363'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-365' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-364'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;' visibility='default' is-declaration-only='yes' id='type-id-366'/>
         <class-decl name='operator_arrow_dispatch&lt;boost::filesystem::directory_entry &amp;, boost::filesystem::directory_entry *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-367'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-175' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-368'/>
             </member-type>
@@ -4066,7 +4031,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::filesystem::directory_entry &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-369'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-371' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-370'/>
             </member-type>
@@ -4207,7 +4171,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-204'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-348' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-208'/>
           </member-type>
@@ -4351,15 +4314,12 @@ 
         <typedef-decl name='typeinfo' type-id='type-id-374' filepath='src/third_party/boost-1.56.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-350'/>
       </namespace-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::path::iterator, const boost::filesystem::path, boost::bidirectional_traversal_tag, const boost::filesystem::path &amp;, long&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-199'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-254' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-375'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-362' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-376'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-13' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-377'/>
           </member-type>
@@ -4436,49 +4396,39 @@ 
         </member-function>
       </class-decl>
       <namespace-decl name='mpl'>
-
-
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;const boost::filesystem::path, const boost::filesystem::path &amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-378'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-379' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-365'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-380'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-366' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-379'/>
             </member-type>
         </class-decl>
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;boost::filesystem::directory_entry, boost::filesystem::directory_entry &amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-381'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-382' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-371'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-383'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-372' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-382'/>
             </member-type>
         </class-decl>
       </namespace-decl>
       <class-decl name='enable_if_c&lt;true, boost::filesystem::path &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-384'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-188' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-336'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::single_pass_traversal_tag, boost::filesystem::directory_entry &amp;, long&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-197'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-174' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-340'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-368' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-385'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-13' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-386'/>
           </member-type>
@@ -4556,10 +4506,8 @@ 
       </class-decl>
       <namespace-decl name='iterators'>
         <class-decl name='enabled&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='30' column='1' id='type-id-387'>
-
             <member-type access='public'>
               <class-decl name='base&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='33' column='1' id='type-id-388'>
-
                   <member-type access='public'>
                     <typedef-decl name='type' type-id='type-id-1' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='35' column='1' id='type-id-389'/>
                   </member-type>
@@ -4740,15 +4688,12 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
       <function-decl name='swap&lt;boost::filesystem::detail::dir_itr_imp *&gt;' mangled-name='_ZSt4swapIPN5boost10filesystem6detail11dir_itr_impEEvRT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPN5boost10filesystem6detail11dir_itr_impEEvRT_S6_'>
         <parameter type-id='type-id-172' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
         <parameter type-id='type-id-172' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
         <return type-id='type-id-18'/>
       </function-decl>
       <class-decl name='remove_reference&lt;boost::filesystem::detail::dir_itr_imp *&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-391'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-171' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-327'/>
           </member-type>
@@ -4758,7 +4703,6 @@ 
         <return type-id='type-id-328'/>
       </function-decl>
       <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-294'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-392' 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-123'/>
           </member-type>
@@ -4770,19 +4714,15 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='iterator_traits&lt;char *&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-393'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-345' 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-394'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-396' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='177' column='1' id='type-id-395'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-219' 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-397'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-63' 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-398'/>
           </member-type>
@@ -4822,7 +4762,6 @@ 
         <return type-id='type-id-18'/>
       </function-decl>
       <class-decl name='remove_reference&lt;boost::filesystem::filesystem_error::m_imp *&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-401'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-185' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-329'/>
           </member-type>
@@ -4833,7 +4772,6 @@ 
       </function-decl>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-335'/>
       <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-402'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-404' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-403'/>
           </member-type>
@@ -4848,11 +4786,9 @@ 
       </class-decl>
       <typedef-decl name='wstring' type-id='type-id-402' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='68' column='1' id='type-id-320'/>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/locale_classes.h' line='62' column='1' id='type-id-299'>
-
           <member-type access='private'>
             <typedef-decl name='category' type-id='type-id-11' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/locale_classes.h' line='67' column='1' id='type-id-307'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/locale_classes.h' line='475' column='1' id='type-id-303'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -4994,7 +4930,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/locale_classes.h' line='436' column='1' id='type-id-313'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -5190,7 +5125,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-291'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-222' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
@@ -5204,15 +5138,12 @@ 
       </class-decl>
       <typedef-decl name='true_' type-id='type-id-291' filepath='src/third_party/boost-1.56.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-390'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;char&gt;' mangled-name='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_'>
         <parameter type-id='type-id-63' name='__ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/type_traits.h' line='150' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
-
-
     <function-decl name='acos' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-9'/>
@@ -5910,7 +5841,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
     <reference-type-def kind='lvalue' type-id='type-id-425' size-in-bits='64' id='type-id-432'/>
     <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-433'/>
-
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -5932,7 +5862,6 @@ 
         </namespace-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-
         <class-decl name='addr_impl_ref&lt;const boost::filesystem::path&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='25' column='1' id='type-id-413'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='v_' type-id='type-id-254' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='27' column='1'/>
@@ -5975,9 +5904,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
       <function-decl name='operator==&lt;boost::filesystem::path::iterator, const boost::filesystem::path, boost::bidirectional_traversal_tag, const boost::filesystem::path &amp;, long, boost::filesystem::path::iterator, const boost::filesystem::path, boost::bidirectional_traversal_tag, const boost::filesystem::path &amp;, long&gt;' mangled-name='_ZN5boosteqINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lS3_S4_S5_S6_lEENS_6detail23enable_if_interoperableIT_T4_NS_3mpl6apply2INS7_12always_bool2ES9_SA_E4typeEE4typeERKNS_15iterator_facadeIS9_T0_T1_T2_T3_EERKNSI_ISA_T5_T6_T7_T8_EE' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='832' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boosteqINS_10filesystem4path8iteratorEKS2_NS_27bidirectional_traversal_tagERS4_lS3_S4_S5_S6_lEENS_6detail23enable_if_interoperableIT_T4_NS_3mpl6apply2INS7_12always_bool2ES9_SA_E4typeEE4typeERKNS_15iterator_facadeIS9_T0_T1_T2_T3_EERKNSI_ISA_T5_T6_T7_T8_EE'>
         <parameter type-id='type-id-275' name='lhs' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='833' column='1'/>
         <parameter type-id='type-id-275' name='rhs' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='833' column='1'/>
@@ -5985,8 +5911,6 @@ 
       </function-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
       <function-decl name='operator&lt;&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_'>
         <parameter type-id='type-id-297' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2588' column='1'/>
         <parameter type-id='type-id-297' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2589' column='1'/>
@@ -6003,19 +5927,15 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='iterator_traits&lt;const char *&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-436'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-423' 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-437'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-36' 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-438'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-345' 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-439'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-396' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='188' column='1' id='type-id-440'/>
           </member-type>
@@ -6036,11 +5956,9 @@ 
         <return type-id='type-id-440'/>
       </function-decl>
       <class-decl name='char_traits&lt;char&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/char_traits.h' line='233' column='1' id='type-id-441'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/char_traits.h' line='235' column='1' id='type-id-425'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/char_traits.h' line='236' column='1' id='type-id-429'/>
           </member-type>
@@ -6149,21 +6067,17 @@ 
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='__enable_if&lt;true, bool&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/type_traits.h' line='47' column='1' id='type-id-442'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/type_traits.h' line='48' column='1' id='type-id-435'/>
           </member-type>
       </class-decl>
       <class-decl name='__normal_iterator&lt;const char *, std::basic_string&lt;char&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-410'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-437' 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-443'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-438' 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-444'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-439' 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-445'/>
           </member-type>
@@ -6264,15 +6178,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char *, std::basic_string&lt;char&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-407'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-397' 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-446'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-398' 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-447'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-394' 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-448'/>
           </member-type>
@@ -6373,9 +6284,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-450'/>
@@ -6400,24 +6308,17 @@ 
     <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-405'/>
     <reference-type-def kind='lvalue' type-id='type-id-320' size-in-bits='64' id='type-id-472'/>
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-473'/>
-
     <namespace-decl name='std'>
-
-
       <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-455'>
-
           <member-type access='private'>
             <typedef-decl name='result' type-id='type-id-475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='73' column='1' id='type-id-474'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='state_type' type-id='type-id-476' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='76' column='1' id='type-id-470'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='intern_type' type-id='type-id-19' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='74' column='1' id='type-id-462'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='extern_type' type-id='type-id-2' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='75' column='1' id='type-id-458'/>
           </member-type>
@@ -6449,7 +6350,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='46' column='1' id='type-id-477'>
-
           <member-type access='private'>
             <enum-decl name='result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/codecvt.h' line='49' column='1' id='type-id-475'>
               <underlying-type type-id='type-id-143'/>
@@ -6461,10 +6361,7 @@ 
           </member-type>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='boost'>
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='convert' mangled-name='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE'>
@@ -6573,8 +6470,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-470' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-476'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-478'>
@@ -6595,22 +6490,14 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <namespace-decl name='std'>
-
-
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
         <parameter type-id='type-id-297' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
         <parameter type-id='type-id-36' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2539' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
-
-
     <namespace-decl name='boost'>
-
-
-
       <namespace-decl name='filesystem'>
         <function-decl name='native' mangled-name='_ZN5boost10filesystem6nativeERKSs' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem6nativeERKSs'>
           <parameter type-id='type-id-319' name='name' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' line='61' column='1'/>
@@ -6638,8 +6525,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-479' size-in-bits='64' id='type-id-480'/>
@@ -6671,35 +6556,25 @@ 
           </function-decl>
         </namespace-decl>
       </namespace-decl>
-
-
-
       <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-490'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-482'/>
           </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
       <class-decl name='allocator&lt;wchar_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-491'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-392' 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-404'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;const wchar_t *&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-492'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-487' 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-493'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-97' 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-494'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-345' 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-495'/>
           </member-type>
@@ -6707,15 +6582,12 @@ 
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__normal_iterator&lt;const wchar_t *, std::basic_string&lt;wchar_t&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-479'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-493' 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-496'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='pointer' type-id='type-id-494' 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-497'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-495' 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-498'/>
           </member-type>
@@ -6816,15 +6688,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-499'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-500'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-501'>
             <data-member access='private'>
@@ -6967,8 +6834,6 @@ 
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
       <class-decl name='numeric_limits&lt;wchar_t&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/limits' line='650' column='1' id='type-id-516'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-222' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/limits' line='652' column='1'/>
@@ -7100,12 +6965,7 @@ 
         <enumerator name='round_toward_neg_infinity' value='3'/>
       </enum-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-write/test10.xml b/tests/data/test-read-write/test10.xml
index 82c3cdeb..883c8f4a 100644
--- a/tests/data/test-read-write/test10.xml
+++ b/tests/data/test-read-write/test10.xml
@@ -4,7 +4,6 @@ 
   <pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
   <namespace-decl name='ns0'>
     <class-decl name='base0' size-in-bits='40' alignment-in-bits='8' visibility='default' id='type-id-4'>
-
         <member-type access='public'>
           <typedef-decl name='TINT' type-id='type-id-2' id='type-id-5'/>
         </member-type>
diff --git a/tests/data/test-read-write/test15.xml b/tests/data/test-read-write/test15.xml
index 01d1b2dd..bac80881 100644
--- a/tests/data/test-read-write/test15.xml
+++ b/tests/data/test-read-write/test15.xml
@@ -3,7 +3,6 @@ 
   <class-template-decl id='class-tmpl-id-2'>
     <template-type-parameter id='type-id-3' name='T'/>
     <class-decl name='C' visibility='default' id='type-id-4'>
-
         <member-type access='public'>
           <typedef-decl name='TINT' type-id='type-id-1' id='type-id-5'/>
         </member-type>
diff --git a/tests/data/test-read-write/test21.xml b/tests/data/test-read-write/test21.xml
index 0f6bbdeb..b35c2468 100644
--- a/tests/data/test-read-write/test21.xml
+++ b/tests/data/test-read-write/test21.xml
@@ -2,7 +2,6 @@ 
   <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
   <type-decl name='void' alignment-in-bits='8' id='type-id-2'/>
   <class-decl name='S' size-in-bits='32' alignment-in-bits='32' visibility='default' filepath='simple-class-0.C' line='5' column='8' id='type-id-3'>
-
       <member-type access='public'>
         <typedef-decl name='S' type-id='type-id-3' filepath='simple-class-0.C' line='6' column='1' id='type-id-4'/>
       </member-type>
diff --git a/tests/data/test-read-write/test25.xml b/tests/data/test-read-write/test25.xml
index 5be51f85..ab842011 100644
--- a/tests/data/test-read-write/test25.xml
+++ b/tests/data/test-read-write/test25.xml
@@ -2,11 +2,9 @@ 
   <type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
   <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' alignment-in-bits='64' id='type-id-3'>
     <subrange length='7' id='type-id-4'/>
-
   </array-type-def>
   <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' alignment-in-bits='8' id='type-id-5'>
     <subrange length='infinite' id='type-id-6'/>
-
   </array-type-def>
   <class-decl name='S' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-7'>
     <data-member access='public' layout-offset-in-bits='0'>
@@ -28,22 +26,17 @@ 
   <type-decl name='double' size-in-bits='64' alignment-in-bits='64' id='type-id-11'/>
   <array-type-def dimensions='2' type-id='type-id-11' size-in-bits='960' alignment-in-bits='64' id='type-id-9'>
     <subrange length='5' id='type-id-12'/>
-
     <subrange length='3' id='type-id-13'/>
-
   </array-type-def>
   <type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-14'/>
   <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' alignment-in-bits='64' id='type-id-16'>
     <subrange length='4' id='type-id-17'/>
-
   </array-type-def>
   <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' alignment-in-bits='64' id='type-id-10'>
     <subrange length='10' id='type-id-19'/>
-
   </array-type-def>
   <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' alignment-in-bits='32' id='type-id-8'>
     <subrange length='5' id='type-id-12'/>
-
   </array-type-def>
   <reference-type-def kind='lvalue' type-id='type-id-7' size-in-bits='64' alignment-in-bits='64' id='type-id-20'/>
   <qualified-type-def type-id='type-id-20' const='yes' id='type-id-21'/>
diff --git a/tests/data/test-read-write/test28-without-std-fns-ref.xml b/tests/data/test-read-write/test28-without-std-fns-ref.xml
index 122021d7..8d1ce615 100644
--- a/tests/data/test-read-write/test28-without-std-fns-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-fns-ref.xml
@@ -220,12 +220,10 @@ 
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-93'/>
     <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-94'/>
     <namespace-decl name='std'>
-
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-95'/>
       <typedef-decl name='ostream' type-id='type-id-95' filepath='/usr/include/c++/5.3.1/iosfwd' line='141' column='1' id='type-id-90'/>
       <var-decl name='cout' type-id='type-id-90' mangled-name='_ZSt4cout' visibility='default' filepath='/usr/include/c++/5.3.1/iostream' line='61' column='1'/>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-53'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-84'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-50'/>
@@ -234,39 +232,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-96' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-60'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-50' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-99' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-98'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-100'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-103' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-105' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-107' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-106'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-109' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-108'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-110'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -280,7 +269,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-57'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-110'/>
@@ -301,15 +289,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-50'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-34'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-111' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-96'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-43' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-101'/>
           </member-type>
@@ -318,11 +303,9 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-107'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-109'/>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-112'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-62'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-8' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-66'/>
           </member-type>
@@ -330,25 +313,19 @@ 
       <typedef-decl name='string' type-id='type-id-53' filepath='/usr/include/c++/5.3.1/bits/stringfwd.h' line='74' column='1' id='type-id-69'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-34'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-111' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-28' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-114'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-26' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-115'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-116'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-43' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-117'/>
           </member-type>
@@ -818,7 +795,6 @@ 
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-12'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-26'/>
diff --git a/tests/data/test-read-write/test28-without-std-vars-ref.xml b/tests/data/test-read-write/test28-without-std-vars-ref.xml
index 065d22d3..0079c0d8 100644
--- a/tests/data/test-read-write/test28-without-std-vars-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-vars-ref.xml
@@ -220,11 +220,9 @@ 
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-93'/>
     <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-94'/>
     <namespace-decl name='std'>
-
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-95'/>
       <typedef-decl name='ostream' type-id='type-id-95' filepath='/usr/include/c++/5.3.1/iosfwd' line='141' column='1' id='type-id-90'/>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-53'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-84'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-50'/>
@@ -233,39 +231,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-96' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-60'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-50' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-99' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-98'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-100'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-103' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-105' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-107' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-106'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-109' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-108'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-110'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -279,7 +268,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-57'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-110'/>
@@ -291,15 +279,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-50'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-34'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-111' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-96'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-43' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-101'/>
           </member-type>
@@ -308,11 +293,9 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-107'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-109'/>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-112'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-62'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-8' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-66'/>
           </member-type>
@@ -320,25 +303,19 @@ 
       <typedef-decl name='string' type-id='type-id-53' filepath='/usr/include/c++/5.3.1/bits/stringfwd.h' line='74' column='1' id='type-id-69'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-34'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-111' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-28' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-114'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-26' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-115'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-116'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-43' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-117'/>
           </member-type>
@@ -743,7 +720,6 @@ 
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-12'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-26'/>