diff mbox series

[1/1] abidw: Treat union members as public by default.

Message ID 20210315160418.153481-2-gprocida@google.com
State New
Headers show
Series Fix union member access specifiers | expand

Commit Message

Giuliano Procida March 15, 2021, 4:04 p.m. UTC
This fixes a bug where abidw reports the access of members of C unions
and of C++ unions without any access specifiers as private.

	* src/abg-dwarf-reader.cc (add_or_update_union_type): Replace
        "class" with "union" in comments; give union members public
        access by default. (finish_member_function_reading):
	Give union members public access by default.
	(maybe_set_member_type_access_specifier): Give union members
	public access by default.
	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi:
        Refresh.
	* tests/data/test-annotate/libtest24-drop-fns.so.abi:
        Refresh.
	* tests/data/test-annotate/test-anonymous-members-0.o.abi:
        Refresh.
	* tests/data/test-annotate/test13-pr18894.so.abi: Refresh.
	* tests/data/test-annotate/test14-pr18893.so.abi: Refresh.
	* tests/data/test-annotate/test15-pr18892.so.abi: Refresh.
	* tests/data/test-annotate/test17-pr19027.so.abi: Refresh.
	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
        Refresh.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
        Refresh.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
        Refresh.
	* tests/data/test-annotate/test21-pr19092.so.abi: Refresh.
	* tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi:
        Refresh.
	* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi:
        Refresh.
	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Refresh.
	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test-PR26568-1.o.abi: Refresh.
	* tests/data/test-read-dwarf/test-PR26568-2.o.abi: Refresh.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Refresh.
	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Refresh.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Refresh.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Refresh.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Refresh.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Refresh.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Refresh.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Refresh.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Refresh.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
        Refresh.
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi:
        Refresh.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-dwarf-reader.cc                       |   20 +-
 .../test-annotate/libtest24-drop-fns-2.so.abi |    4 +-
 .../test-annotate/libtest24-drop-fns.so.abi   |    4 +-
 .../test-anonymous-members-0.o.abi            |    8 +-
 .../data/test-annotate/test13-pr18894.so.abi  |    4 +-
 .../data/test-annotate/test14-pr18893.so.abi  |    8 +-
 .../data/test-annotate/test15-pr18892.so.abi  |   40 +-
 .../data/test-annotate/test17-pr19027.so.abi  |  282 ++--
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   12 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |   84 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |   12 +-
 .../data/test-annotate/test21-pr19092.so.abi  |  118 +-
 .../PR25409-librte_bus_dpaa.so.20.0.abi       |  238 +--
 .../test0-pr19026-libvtkIOSQL-6.1.so.1.abi    | 1384 ++++++++---------
 .../PR22015-libboost_iostreams.so.abi         |    4 +-
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi |  208 +--
 .../libtest24-drop-fns-2.so.abi               |    4 +-
 .../test-read-dwarf/libtest24-drop-fns.so.abi |    4 +-
 .../data/test-read-dwarf/test-PR26568-1.o.abi |    4 +-
 .../data/test-read-dwarf/test-PR26568-2.o.abi |    4 +-
 .../test-read-dwarf/test-libandroid.so.abi    |  240 +--
 .../test-read-dwarf/test10-pr18818-gcc.so.abi |    8 +-
 .../test-read-dwarf/test11-pr18828.so.abi     |   52 +-
 .../test-read-dwarf/test12-pr18844.so.abi     |  106 +-
 .../test-read-dwarf/test13-pr18894.so.abi     |    4 +-
 .../test-read-dwarf/test14-pr18893.so.abi     |    8 +-
 .../test-read-dwarf/test15-pr18892.so.abi     |   40 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |   58 +-
 .../test-read-dwarf/test17-pr19027.so.abi     |  282 ++--
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   12 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |   84 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |   12 +-
 .../test-read-dwarf/test21-pr19092.so.abi     |  118 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |   80 +-
 .../test9-pr18818-clang.so.abi                |   12 +-
 35 files changed, 1781 insertions(+), 1781 deletions(-)

Comments

Dodji Seketeli March 19, 2021, 4:40 p.m. UTC | #1
Hello,

Giuliano Procida <gprocida@google.com> a écrit:

> This fixes a bug where abidw reports the access of members of C unions
> and of C++ unions without any access specifiers as private.
>
> 	* src/abg-dwarf-reader.cc (add_or_update_union_type): Replace
>         "class" with "union" in comments; give union members public
>         access by default. (finish_member_function_reading):
> 	Give union members public access by default.

I edited the ChangeLog a bit to fix the formatting.

> 	(maybe_set_member_type_access_specifier): Give union members
> 	public access by default.
> 	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi:
>         Refresh.
> 	* tests/data/test-annotate/libtest24-drop-fns.so.abi:
>         Refresh.
> 	* tests/data/test-annotate/test-anonymous-members-0.o.abi:
>         Refresh.
> 	* tests/data/test-annotate/test13-pr18894.so.abi: Refresh.
> 	* tests/data/test-annotate/test14-pr18893.so.abi: Refresh.
> 	* tests/data/test-annotate/test15-pr18892.so.abi: Refresh.
> 	* tests/data/test-annotate/test17-pr19027.so.abi: Refresh.
> 	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
>         Refresh.
> 	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
>         Refresh.
> 	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
>         Refresh.
> 	* tests/data/test-annotate/test21-pr19092.so.abi: Refresh.
> 	* tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi:
>         Refresh.
> 	* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Refresh.
> 	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test-PR26568-1.o.abi: Refresh.
> 	* tests/data/test-read-dwarf/test-PR26568-2.o.abi: Refresh.
> 	* tests/data/test-read-dwarf/test-libandroid.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Refresh.
> 	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
>         Refresh.
> 	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi:
>         Refresh.
>
> Signed-off-by: Giuliano Procida <gprocida@google.com>

Applied to master, thanks!

[...]
diff mbox series

Patch

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index b6b10116..b46b65de 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -13575,10 +13575,10 @@  finish_member_function_reading(Dwarf_Die*		  die,
   int64_t vindex = -1;
   if (is_virtual)
     die_virtual_function_index(die, vindex);
-  access_specifier access = private_access;
+  access_specifier access = public_access;
   if (class_decl_sptr c = is_class_type(klass))
-    if (c->is_struct())
-      access = public_access;
+    if (!c->is_struct())
+      access = private_access;
   die_access_specifier(die, access);
 
   bool is_static = false;
@@ -14398,7 +14398,7 @@  add_or_update_union_type(read_context&	 ctxt,
 
   // if we've already seen a union with the same union as 'die' then
   // let's re-use that one. We can't really safely re-use anonymous
-  // classes as they have no name, by construction.  What we can do,
+  // unions as they have no name, by construction.  What we can do,
   // rather, is to reuse the typedef that name them, when they do have
   // a naming typedef.
   if (!is_anonymous)
@@ -14484,11 +14484,11 @@  add_or_update_union_type(read_context&	 ctxt,
 	      if (!t)
 		continue;
 
-	      // We have a non-static data member.  So this class
-	      // cannot be a declaration-only class anymore, even if
+	      // We have a non-static data member.  So this union
+	      // cannot be a declaration-only union anymore, even if
 	      // some DWARF emitters might consider it otherwise.
 	      result->set_is_declaration_only(false);
-	      access_specifier access = private_access;
+	      access_specifier access = public_access;
 
 	      die_access_specifier(&child, access);
 
@@ -16647,10 +16647,10 @@  maybe_set_member_type_access_specifier(decl_base_sptr member_type_declaration,
 	is_class_or_union_type(member_type_declaration->get_scope());
       ABG_ASSERT(scope);
 
-      access_specifier access = private_access;
+      access_specifier access = public_access;
       if (class_decl* cl = is_class_type(scope))
-	if (cl->is_struct())
-	  access = public_access;
+	if (!cl->is_struct())
+	  access = private_access;
 
       die_access_specifier(die, access);
       set_member_access_specifier(member_type_declaration, access);
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 33e45f16..36cb46a8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -96,11 +96,11 @@ 
       <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-31'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int __wch -->
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char __wchb[4] -->
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 33e45f16..36cb46a8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -96,11 +96,11 @@ 
       <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-31'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int __wch -->
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char __wchb[4] -->
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
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 3893c85f..d71cc170 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -72,11 +72,11 @@ 
       <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'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- int a -->
             <var-decl name='a' type-id='type-id-3' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='24' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char b -->
             <var-decl name='b' type-id='type-id-1' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='24' column='1'/>
           </data-member>
@@ -85,11 +85,11 @@ 
       <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'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int c -->
             <var-decl name='c' type-id='type-id-5' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='26' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- double d -->
             <var-decl name='d' type-id='type-id-2' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='26' column='1'/>
           </data-member>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index d80d3d75..45026ed0 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -3461,11 +3461,11 @@ 
     <typedef-decl name='DBusGUID' type-id='type-id-171' filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-165'/>
     <!-- union DBusGUID -->
     <union-decl name='DBusGUID' size-in-bits='128' visibility='default' filepath='../dbus/dbus-internals.h' line='351' column='1' id='type-id-171'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- dbus_uint32_t DBusGUID::as_uint32s[4] -->
         <var-decl name='as_uint32s' type-id='type-id-161' visibility='default' filepath='../dbus/dbus-internals.h' line='352' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- char DBusGUID::as_bytes[16] -->
         <var-decl name='as_bytes' type-id='type-id-159' visibility='default' filepath='../dbus/dbus-internals.h' line='353' column='1'/>
       </data-member>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 7c977b1d..d795ee81 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -3150,11 +3150,11 @@ 
       <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-158'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- O_nurbscurve* o_nurbscurve -->
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- O_pwlcurve* o_pwlcurve -->
             <var-decl name='o_pwlcurve' type-id='type-id-99' visibility='default' filepath='libnurbs/internals/reader.h' line='58' column='1'/>
           </data-member>
@@ -8303,11 +8303,11 @@ 
       <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-158'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- O_nurbscurve* o_nurbscurve -->
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- O_pwlcurve* o_pwlcurve -->
             <var-decl name='o_pwlcurve' type-id='type-id-99' visibility='default' filepath='libnurbs/internals/reader.h' line='58' column='1'/>
           </data-member>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 0770e2f4..3fb83a39 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3764,51 +3764,51 @@ 
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
     <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='458' column='1' id='type-id-61'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const char* s; int len;} s_name -->
         <var-decl name='s_name' type-id='type-id-63' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='467' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
         <var-decl name='s_operator' type-id='type-id-64' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='474' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
         <var-decl name='s_extended_operator' type-id='type-id-65' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='483' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
         <var-decl name='s_fixed' type-id='type-id-66' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='494' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
         <var-decl name='s_ctor' type-id='type-id-67' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='503' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
         <var-decl name='s_dtor' type-id='type-id-68' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='512' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
         <var-decl name='s_builtin' type-id='type-id-69' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='519' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const char* string; int len;} s_string -->
         <var-decl name='s_string' type-id='type-id-70' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='528' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {long int number;} s_number -->
         <var-decl name='s_number' type-id='type-id-71' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='535' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {int character;} s_character -->
         <var-decl name='s_character' type-id='type-id-72' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='541' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
         <var-decl name='s_binary' type-id='type-id-73' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='550' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
         <var-decl name='s_unary_num' type-id='type-id-74' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='558' column='1'/>
       </data-member>
@@ -5731,11 +5731,11 @@ 
       <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-254'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- Elf64_Xword d_val -->
             <var-decl name='d_val' type-id='type-id-255' visibility='default' filepath='/usr/include/elf.h' line='647' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- Elf64_Addr d_ptr -->
             <var-decl name='d_ptr' type-id='type-id-249' visibility='default' filepath='/usr/include/elf.h' line='648' column='1'/>
           </data-member>
@@ -5814,11 +5814,11 @@ 
         <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-280'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- void (int, void*, void*)* sigaction -->
               <var-decl name='sigaction' type-id='type-id-276' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='425' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- void (int)* handler -->
               <var-decl name='handler' type-id='type-id-281' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='426' column='1'/>
             </data-member>
@@ -6240,11 +6240,11 @@ 
     <typedef-decl name='pthread_attr_t' type-id='type-id-301' filepath='/usr/include/bits/pthreadtypes.h' line='57' column='1' id='type-id-302'/>
     <!-- union {char __size[56]; long int __align;} -->
     <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='54' column='1' id='type-id-301'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- char __size[56] -->
         <var-decl name='__size' type-id='type-id-296' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='55' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- long int __align -->
         <var-decl name='__align' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='56' column='1'/>
       </data-member>
@@ -11785,11 +11785,11 @@ 
       <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-634'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- sighandler_t sa_handler -->
             <var-decl name='sa_handler' type-id='type-id-635' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='93' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- void (int, my_siginfo_t*, void*)* sa_sigaction -->
             <var-decl name='sa_sigaction' type-id='type-id-636' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='94' column='1'/>
           </data-member>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 956f7172..6627713d 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -566,7 +566,7 @@ 
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-23'/>
     <!-- union pthread_mutex_t -->
     <union-decl name='pthread_mutex_t' size-in-bits='320' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-22'>
-      <member-type access='private'>
+      <member-type access='public'>
         <!-- struct pthread_mutex_t::__pthread_mutex_s -->
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-24'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -599,15 +599,15 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- pthread_mutex_t::__pthread_mutex_s pthread_mutex_t::__data -->
         <var-decl name='__data' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- char pthread_mutex_t::__size[40] -->
         <var-decl name='__size' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- long int pthread_mutex_t::__align -->
         <var-decl name='__align' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
@@ -1605,27 +1605,27 @@ 
     <typedef-decl name='hb_var_int_t' type-id='type-id-136' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-134'/>
     <!-- union _hb_var_int_t -->
     <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-136'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- uint32_t _hb_var_int_t::u32 -->
         <var-decl name='u32' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int32_t _hb_var_int_t::i32 -->
         <var-decl name='i32' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- uint16_t _hb_var_int_t::u16[2] -->
         <var-decl name='u16' type-id='type-id-83' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int16_t _hb_var_int_t::i16[2] -->
         <var-decl name='i16' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- uint8_t _hb_var_int_t::u8[4] -->
         <var-decl name='u8' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int8_t _hb_var_int_t::i8[4] -->
         <var-decl name='i8' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
       </data-member>
@@ -6429,7 +6429,7 @@ 
         <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-612'>
-            <member-type access='private'>
+            <member-type access='public'>
               <!-- struct {OT::Tag ttcTag; OT::FixedVersion version;} -->
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-613'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -6442,11 +6442,11 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- struct {OT::Tag ttcTag; OT::FixedVersion version;} header -->
               <var-decl name='header' type-id='type-id-613' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::TTCHeaderVersion1 version1 -->
               <var-decl name='version1' type-id='type-id-302' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
             </data-member>
@@ -6475,15 +6475,15 @@ 
         <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-617'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::Tag tag -->
               <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::OpenTypeFontFace fontFace -->
               <var-decl name='fontFace' type-id='type-id-369' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::TTCHeader ttcHeader -->
               <var-decl name='ttcHeader' type-id='type-id-299' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
             </data-member>
@@ -7300,11 +7300,11 @@ 
             <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-796'>
-                <data-member access='private'>
+                <data-member access='public'>
                   <!-- OT::CoverageFormat1::Iter format1 -->
                   <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
-                <data-member access='private'>
+                <data-member access='public'>
                   <!-- OT::CoverageFormat2::Iter format2 -->
                   <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
@@ -7332,15 +7332,15 @@ 
         <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-800'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CoverageFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-623' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CoverageFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-624' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
             </data-member>
@@ -8441,7 +8441,7 @@ 
         <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-829'>
-            <member-type access='private'>
+            <member-type access='public'>
               <!-- struct {OT::USHORT sub_format;} -->
               <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -8450,39 +8450,39 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- struct {OT::USHORT sub_format;} header -->
               <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubst single -->
               <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MultipleSubst multiple -->
               <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AlternateSubst alternate -->
               <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::LigatureSubst ligature -->
               <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextSubst context -->
               <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextSubst chainContext -->
               <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionSubst extension -->
               <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
               <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
@@ -8788,11 +8788,11 @@ 
         <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-918'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AlternateSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
@@ -10146,11 +10146,11 @@ 
         <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-965'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::LigatureSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-628' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
             </data-member>
@@ -10355,11 +10355,11 @@ 
         <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-967'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MultipleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
@@ -10648,11 +10648,11 @@ 
         <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-977'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ReverseChainSingleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
@@ -10779,15 +10779,15 @@ 
         <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-980'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-669' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubstFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-670' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
             </data-member>
@@ -11265,19 +11265,19 @@ 
         <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-1011'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
@@ -11328,19 +11328,19 @@ 
         <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-1016'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
@@ -11391,11 +11391,11 @@ 
         <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-1020'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
@@ -14981,11 +14981,11 @@ 
     <typedef-decl name='FT_StreamDesc' type-id='type-id-1195' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-1192'/>
     <!-- union FT_StreamDesc_ -->
     <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-1195'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- long int FT_StreamDesc_::value -->
         <var-decl name='value' type-id='type-id-10' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='211' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- void* FT_StreamDesc_::pointer -->
         <var-decl name='pointer' type-id='type-id-33' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='212' column='1'/>
       </data-member>
@@ -16210,35 +16210,35 @@ 
         <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-1367'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat0 format0 -->
               <var-decl name='format0' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat4 format4 -->
               <var-decl name='format4' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat6 format6 -->
               <var-decl name='format6' type-id='type-id-1362' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat10 format10 -->
               <var-decl name='format10' type-id='type-id-1363' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='442' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat12 format12 -->
               <var-decl name='format12' type-id='type-id-1364' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='443' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat13 format13 -->
               <var-decl name='format13' type-id='type-id-1365' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CmapSubtableFormat14 format14 -->
               <var-decl name='format14' type-id='type-id-882' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
             </data-member>
@@ -19924,7 +19924,7 @@ 
         <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-829'>
-            <member-type access='private'>
+            <member-type access='public'>
               <!-- struct {OT::USHORT sub_format;} -->
               <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -19933,39 +19933,39 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- struct {OT::USHORT sub_format;} header -->
               <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubst single -->
               <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MultipleSubst multiple -->
               <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AlternateSubst alternate -->
               <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::LigatureSubst ligature -->
               <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextSubst context -->
               <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextSubst chainContext -->
               <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionSubst extension -->
               <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
               <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
@@ -20358,11 +20358,11 @@ 
             <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-796'>
-                <data-member access='private'>
+                <data-member access='public'>
                   <!-- OT::CoverageFormat1::Iter format1 -->
                   <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
-                <data-member access='private'>
+                <data-member access='public'>
                   <!-- OT::CoverageFormat2::Iter format2 -->
                   <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
@@ -20390,15 +20390,15 @@ 
         <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-800'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CoverageFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-623' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CoverageFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-624' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
             </data-member>
@@ -20489,11 +20489,11 @@ 
         <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-2304'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='313' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkGlyphSetsFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1645' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='314' column='1'/>
             </data-member>
@@ -21249,15 +21249,15 @@ 
         <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-2305'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::FeatureParamsSize size -->
               <var-decl name='size' type-id='type-id-894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::FeatureParamsStylisticSet stylisticSet -->
               <var-decl name='stylisticSet' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::FeatureParamsCharacterVariants characterVariants -->
               <var-decl name='characterVariants' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
             </data-member>
@@ -21773,15 +21773,15 @@ 
         <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-2306'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ClassDefFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ClassDefFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-1539' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
             </data-member>
@@ -21960,11 +21960,11 @@ 
         <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-1020'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
@@ -22092,15 +22092,15 @@ 
         <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-980'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-669' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SingleSubstFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-670' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
             </data-member>
@@ -22202,11 +22202,11 @@ 
         <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-967'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MultipleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
@@ -22290,11 +22290,11 @@ 
         <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-918'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AlternateSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
@@ -22384,11 +22384,11 @@ 
         <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-965'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::LigatureSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-628' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
             </data-member>
@@ -22459,19 +22459,19 @@ 
         <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-1016'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
@@ -22520,19 +22520,19 @@ 
         <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-1011'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
@@ -22581,11 +22581,11 @@ 
         <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-977'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ReverseChainSingleSubstFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
@@ -22698,19 +22698,19 @@ 
         <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-2309'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CaretValueFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CaretValueFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CaretValueFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
             </data-member>
@@ -22863,19 +22863,19 @@ 
         <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-2310'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AnchorFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AnchorFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::AnchorFormat3 format3 -->
               <var-decl name='format3' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
             </data-member>
@@ -24574,15 +24574,15 @@ 
         <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-2322'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SinglePosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SinglePosFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
             </data-member>
@@ -24631,15 +24631,15 @@ 
         <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-2323'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::PairPosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::PairPosFormat2 format2 -->
               <var-decl name='format2' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
             </data-member>
@@ -24688,11 +24688,11 @@ 
         <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-2324'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CursivePosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-1112' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
             </data-member>
@@ -24741,11 +24741,11 @@ 
         <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-2325'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkBasePosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
             </data-member>
@@ -24794,11 +24794,11 @@ 
         <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-2326'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkLigPosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-898' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
             </data-member>
@@ -24847,11 +24847,11 @@ 
         <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-2327'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkMarkPosFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
             </data-member>
@@ -24915,11 +24915,11 @@ 
         <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-2331'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionFormat1 format1 -->
               <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
@@ -24970,7 +24970,7 @@ 
         <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-2333'>
-            <member-type access='private'>
+            <member-type access='public'>
               <!-- struct {OT::USHORT sub_format;} -->
               <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1425' column='1' id='type-id-2334'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -24979,43 +24979,43 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- struct {OT::USHORT sub_format;} header -->
               <var-decl name='header' type-id='type-id-2334' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1427' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::SinglePos single -->
               <var-decl name='single' type-id='type-id-1793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1428' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::PairPos pair -->
               <var-decl name='pair' type-id='type-id-1737' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1429' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::CursivePos cursive -->
               <var-decl name='cursive' type-id='type-id-1567' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1430' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkBasePos markBase -->
               <var-decl name='markBase' type-id='type-id-1636' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1431' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkLigPos markLig -->
               <var-decl name='markLig' type-id='type-id-1648' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1432' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::MarkMarkPos markMark -->
               <var-decl name='markMark' type-id='type-id-1653' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1433' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ContextPos context -->
               <var-decl name='context' type-id='type-id-2328' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1434' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ChainContextPos chainContext -->
               <var-decl name='chainContext' type-id='type-id-2329' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1435' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- OT::ExtensionPos extension -->
               <var-decl name='extension' type-id='type-id-2330' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1436' column='1'/>
             </data-member>
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 c086b8f6..dc70814e 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
@@ -1095,7 +1095,7 @@ 
     <typedef-decl name='__gthread_mutex_t' type-id='type-id-41' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/gthr-default.h' line='47' column='1' id='type-id-42'/>
     <!-- union pthread_mutex_t -->
     <union-decl name='pthread_mutex_t' size-in-bits='320' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-41'>
-      <member-type access='private'>
+      <member-type access='public'>
         <!-- struct pthread_mutex_t::__pthread_mutex_s -->
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-43'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -1128,15 +1128,15 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- pthread_mutex_t::__pthread_mutex_s pthread_mutex_t::__data -->
         <var-decl name='__data' type-id='type-id-43' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- char pthread_mutex_t::__size[40] -->
         <var-decl name='__size' type-id='type-id-8' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- long int pthread_mutex_t::__align -->
         <var-decl name='__align' type-id='type-id-20' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
@@ -1713,11 +1713,11 @@ 
       <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-84'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int __wch -->
             <var-decl name='__wch' type-id='type-id-13' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char __wchb[4] -->
             <var-decl name='__wchb' type-id='type-id-10' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
           </data-member>
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 a09035c1..76e67c1c 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
@@ -3457,11 +3457,11 @@ 
       <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-187'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char MemoryRegionMap::RegionSetRep::rep[48] -->
             <var-decl name='rep' type-id='type-id-188' visibility='default' filepath='src/memory_region_map.cc' line='178' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- void* MemoryRegionMap::RegionSetRep::align_it -->
             <var-decl name='align_it' type-id='type-id-58' visibility='default' filepath='src/memory_region_map.cc' line='179' column='1'/>
           </data-member>
@@ -13716,19 +13716,19 @@ 
         <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-1157'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- const char* str -->
               <var-decl name='str' type-id='type-id-57' visibility='default' filepath='src/internal_logging.h' line='92' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- void* ptr -->
               <var-decl name='ptr' type-id='type-id-58' visibility='default' filepath='src/internal_logging.h' line='93' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- int64_t snum -->
               <var-decl name='snum' type-id='type-id-103' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- uint64_t unum -->
               <var-decl name='unum' type-id='type-id-15' visibility='default' filepath='src/internal_logging.h' line='95' column='1'/>
             </data-member>
@@ -16324,7 +16324,7 @@ 
       <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-1373'>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid;} -->
             <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='64' column='1' id='type-id-1374'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16337,7 +16337,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {int si_tid; int si_overrun; sigval_t si_sigval;} -->
             <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='71' column='1' id='type-id-1376'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16354,7 +16354,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} -->
             <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='79' column='1' id='type-id-1378'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16371,7 +16371,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} -->
             <class-decl name='__anonymous_struct__3' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='87' column='1' id='type-id-1379'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16396,7 +16396,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {void* si_addr;} -->
             <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='97' column='1' id='type-id-1381'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16405,7 +16405,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {long int si_band; int si_fd;} -->
             <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='103' column='1' id='type-id-1382'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -16418,31 +16418,31 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- int _pad[28] -->
             <var-decl name='_pad' type-id='type-id-1383' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid;} _kill -->
             <var-decl name='_kill' type-id='type-id-1374' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer -->
             <var-decl name='_timer' type-id='type-id-1376' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt -->
             <var-decl name='_rt' type-id='type-id-1378' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} _sigchld -->
             <var-decl name='_sigchld' type-id='type-id-1379' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {void* si_addr;} _sigfault -->
             <var-decl name='_sigfault' type-id='type-id-1381' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {long int si_band; int si_fd;} _sigpoll -->
             <var-decl name='_sigpoll' type-id='type-id-1382' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
           </data-member>
@@ -16478,11 +16478,11 @@ 
     <typedef-decl name='sigval_t' type-id='type-id-1385' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1377'/>
     <!-- union sigval -->
     <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/usr/include/bits/siginfo.h' line='34' column='1' id='type-id-1385'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int sigval::sival_int -->
         <var-decl name='sival_int' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='35' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- void* sigval::sival_ptr -->
         <var-decl name='sival_ptr' type-id='type-id-58' visibility='default' filepath='/usr/include/bits/siginfo.h' line='36' column='1'/>
       </data-member>
@@ -17073,7 +17073,7 @@ 
       <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-1373'>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid;} -->
             <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='64' column='1' id='type-id-1374'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17086,7 +17086,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {int si_tid; int si_overrun; sigval_t si_sigval;} -->
             <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='71' column='1' id='type-id-1376'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17103,7 +17103,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} -->
             <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='79' column='1' id='type-id-1378'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17120,7 +17120,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} -->
             <class-decl name='__anonymous_struct__3' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='87' column='1' id='type-id-1379'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17145,7 +17145,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {void* si_addr;} -->
             <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='97' column='1' id='type-id-1381'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17154,7 +17154,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {long int si_band; int si_fd;} -->
             <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='103' column='1' id='type-id-1382'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -17167,31 +17167,31 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- int _pad[28] -->
             <var-decl name='_pad' type-id='type-id-1383' visibility='default' filepath='/usr/include/bits/siginfo.h' line='60' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid;} _kill -->
             <var-decl name='_kill' type-id='type-id-1374' visibility='default' filepath='/usr/include/bits/siginfo.h' line='67' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer -->
             <var-decl name='_timer' type-id='type-id-1376' visibility='default' filepath='/usr/include/bits/siginfo.h' line='75' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt -->
             <var-decl name='_rt' type-id='type-id-1378' visibility='default' filepath='/usr/include/bits/siginfo.h' line='83' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} _sigchld -->
             <var-decl name='_sigchld' type-id='type-id-1379' visibility='default' filepath='/usr/include/bits/siginfo.h' line='93' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {void* si_addr;} _sigfault -->
             <var-decl name='_sigfault' type-id='type-id-1381' visibility='default' filepath='/usr/include/bits/siginfo.h' line='99' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {long int si_band; int si_fd;} _sigpoll -->
             <var-decl name='_sigpoll' type-id='type-id-1382' visibility='default' filepath='/usr/include/bits/siginfo.h' line='106' column='1'/>
           </data-member>
@@ -17389,11 +17389,11 @@ 
     <typedef-decl name='sigval_t' type-id='type-id-1385' filepath='/usr/include/bits/siginfo.h' line='37' column='1' id='type-id-1377'/>
     <!-- union sigval -->
     <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/usr/include/bits/siginfo.h' line='34' column='1' id='type-id-1385'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int sigval::sival_int -->
         <var-decl name='sival_int' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/siginfo.h' line='35' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- void* sigval::sival_ptr -->
         <var-decl name='sival_ptr' type-id='type-id-58' visibility='default' filepath='/usr/include/bits/siginfo.h' line='36' column='1'/>
       </data-member>
@@ -19492,11 +19492,11 @@ 
       <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-1600'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int __wch -->
             <var-decl name='__wch' type-id='type-id-64' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char __wchb[4] -->
             <var-decl name='__wchb' type-id='type-id-1557' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
           </data-member>
@@ -23732,19 +23732,19 @@ 
         <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-1157'>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- const char* str -->
               <var-decl name='str' type-id='type-id-57' visibility='default' filepath='src/internal_logging.h' line='92' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- void* ptr -->
               <var-decl name='ptr' type-id='type-id-58' visibility='default' filepath='src/internal_logging.h' line='93' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- int64_t snum -->
               <var-decl name='snum' type-id='type-id-103' visibility='default' filepath='src/internal_logging.h' line='94' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <!-- uint64_t unum -->
               <var-decl name='unum' type-id='type-id-15' visibility='default' filepath='src/internal_logging.h' line='95' column='1'/>
             </data-member>
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 bcf0186f..e8e9514a 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
@@ -983,7 +983,7 @@ 
     <typedef-decl name='__gthread_mutex_t' type-id='type-id-43' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/gthr-default.h' line='47' column='1' id='type-id-44'/>
     <!-- union pthread_mutex_t -->
     <union-decl name='pthread_mutex_t' size-in-bits='320' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-43'>
-      <member-type access='private'>
+      <member-type access='public'>
         <!-- struct pthread_mutex_t::__pthread_mutex_s -->
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-45'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -1016,15 +1016,15 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- pthread_mutex_t::__pthread_mutex_s pthread_mutex_t::__data -->
         <var-decl name='__data' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- char pthread_mutex_t::__size[40] -->
         <var-decl name='__size' type-id='type-id-8' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- long int pthread_mutex_t::__align -->
         <var-decl name='__align' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
@@ -1671,11 +1671,11 @@ 
       <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-100'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int __wch -->
             <var-decl name='__wch' type-id='type-id-13' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- char __wchb[4] -->
             <var-decl name='__wchb' type-id='type-id-10' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
           </data-member>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 62dadede..c57c98c2 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1624,11 +1624,11 @@ 
       <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-105'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- line_map_ordinary line_map::map_u::ordinary -->
             <var-decl name='ordinary' type-id='type-id-106' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='211' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- line_map_macro line_map::map_u::macro -->
             <var-decl name='macro' type-id='type-id-107' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='212' column='1'/>
           </data-member>
@@ -2618,19 +2618,19 @@ 
     </function-type>
     <!-- union _cpp_hashnode_value -->
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-81'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
         <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- answer* _cpp_hashnode_value::answers -->
         <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
         <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
         <var-decl name='arg_index' type-id='type-id-29' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='673' column='1'/>
       </data-member>
@@ -2710,11 +2710,11 @@ 
       <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-162'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
             <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
           </data-member>
@@ -2818,27 +2818,27 @@ 
       <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-174'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
             <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
             <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
             <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
             <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
             <var-decl name='token_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int cpp_token::cpp_token_u::pragma -->
             <var-decl name='pragma' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='247' column='1'/>
           </data-member>
@@ -5725,7 +5725,7 @@ 
       <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-321'>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {utoken first; utoken last;} -->
             <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -5738,7 +5738,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
             <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -5751,11 +5751,11 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {utoken first; utoken last;} iso -->
             <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
             <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
@@ -5764,11 +5764,11 @@ 
       <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-325'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- macro_context* mc -->
             <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_hashnode* macro -->
             <var-decl name='macro' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
           </data-member>
@@ -6626,11 +6626,11 @@ 
     <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-316'/>
     <!-- union utoken -->
     <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- const cpp_token* utoken::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- const cpp_token** utoken::ptoken -->
         <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
@@ -8189,27 +8189,27 @@ 
       <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-174'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
             <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
             <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
             <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
             <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
             <var-decl name='token_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- unsigned int cpp_token::cpp_token_u::pragma -->
             <var-decl name='pragma' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='247' column='1'/>
           </data-member>
@@ -8256,19 +8256,19 @@ 
     </enum-decl>
     <!-- union _cpp_hashnode_value -->
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-81'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
         <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- answer* _cpp_hashnode_value::answers -->
         <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
         <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
         <var-decl name='arg_index' type-id='type-id-29' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='673' column='1'/>
       </data-member>
@@ -8298,11 +8298,11 @@ 
       <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-162'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
             <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
           </data-member>
@@ -9648,7 +9648,7 @@ 
       <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-321'>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {utoken first; utoken last;} -->
             <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -9661,7 +9661,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
             <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -9674,11 +9674,11 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {utoken first; utoken last;} iso -->
             <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
             <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
@@ -9687,11 +9687,11 @@ 
       <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-325'>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- macro_context* mc -->
             <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <!-- cpp_hashnode* macro -->
             <var-decl name='macro' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
           </data-member>
@@ -9724,11 +9724,11 @@ 
     </class-decl>
     <!-- union utoken -->
     <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- const cpp_token* utoken::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- const cpp_token** utoken::ptoken -->
         <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
@@ -11281,51 +11281,51 @@ 
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
     <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-453'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const char* s; int len;} s_name -->
         <var-decl name='s_name' type-id='type-id-454' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
         <var-decl name='s_operator' type-id='type-id-455' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
         <var-decl name='s_extended_operator' type-id='type-id-456' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
         <var-decl name='s_fixed' type-id='type-id-457' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
         <var-decl name='s_ctor' type-id='type-id-458' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
         <var-decl name='s_dtor' type-id='type-id-459' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
         <var-decl name='s_builtin' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {const char* string; int len;} s_string -->
         <var-decl name='s_string' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {long int number;} s_number -->
         <var-decl name='s_number' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {int character;} s_character -->
         <var-decl name='s_character' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
         <var-decl name='s_binary' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
         <var-decl name='s_unary_num' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
@@ -12615,26 +12615,26 @@ 
     <typedef-decl name='__WAIT_STATUS' type-id='type-id-497' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-498'/>
     <!-- union {wait* __uptr; int* __iptr;} -->
     <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-497'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- wait* __uptr -->
         <var-decl name='__uptr' type-id='type-id-499' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int* __iptr -->
         <var-decl name='__iptr' type-id='type-id-42' visibility='default' filepath='/usr/include/stdlib.h' line='71' column='1'/>
       </data-member>
     </union-decl>
     <!-- union wait -->
     <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-500'>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- int wait::w_status -->
         <var-decl name='w_status' type-id='type-id-18' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='69' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} wait::__wait_terminated -->
         <var-decl name='__wait_terminated' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} wait::__wait_stopped -->
         <var-decl name='__wait_stopped' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
       </data-member>
diff --git a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
index 7e533391..52b7ce7e 100644
--- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
+++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
@@ -537,10 +537,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='88' column='1' id='type-id-75'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-76' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='89' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='94' column='1'/>
       </data-member>
     </union-decl>
@@ -562,13 +562,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='43' column='1' id='type-id-77'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-78' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='44' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-79' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='57' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='opaque' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='66' column='1'/>
       </data-member>
     </union-decl>
@@ -618,10 +618,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__2' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='114' column='1' id='type-id-84'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='acquire' type-id='type-id-85' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='115' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='query' type-id='type-id-86' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='116' column='1'/>
       </data-member>
     </union-decl>
@@ -644,13 +644,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__3' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='138' column='1' id='type-id-88'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-89' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='139' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='acquire' type-id='type-id-90' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='150' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='query' type-id='type-id-91' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='151' column='1'/>
       </data-member>
     </union-decl>
@@ -663,10 +663,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__4' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='143' column='1' id='type-id-90'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-92' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='144' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='bufs' type-id='type-id-43' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_bman.h' line='149' column='1'/>
       </data-member>
     </union-decl>
@@ -1010,13 +1010,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='121' column='1' id='type-id-159'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-162' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='122' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-163' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='141' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='opaque_addr' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='146' column='1'/>
       </data-member>
     </union-decl>
@@ -1052,16 +1052,16 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='154' column='1' id='type-id-160'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='opaque' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='158' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-164' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='160' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-165' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='172' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-166' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='182' column='1'/>
       </data-member>
     </union-decl>
@@ -1101,10 +1101,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__2' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='192' column='1' id='type-id-161'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cmd' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='193' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='status' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='194' column='1'/>
       </data-member>
     </union-decl>
@@ -1192,13 +1192,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__3' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='327' column='1' id='type-id-171'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='ern' type-id='type-id-172' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='337' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dcern' type-id='type-id-173' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='355' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='fq' type-id='type-id-174' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='363' column='1'/>
       </data-member>
     </union-decl>
@@ -1310,31 +1310,31 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__4' size-in-bits='504' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='800' column='1' id='type-id-179'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='initfq' type-id='type-id-180' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='801' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='queryfq' type-id='type-id-181' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='802' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='queryfq_np' type-id='type-id-182' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='803' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='alterfq' type-id='type-id-183' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='804' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='initcgr' type-id='type-id-184' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='805' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cgrtestwrite' type-id='type-id-185' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='806' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querycgr' type-id='type-id-186' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='807' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querycongestion' type-id='type-id-187' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='808' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querywq' type-id='type-id-188' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='809' column='1'/>
       </data-member>
     </union-decl>
@@ -1391,10 +1391,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__5' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='442' column='1' id='type-id-190'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='orpc' type-id='type-id-51' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='443' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-195' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='444' column='1'/>
       </data-member>
     </union-decl>
@@ -1413,10 +1413,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__6' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='460' column='1' id='type-id-191'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dest_wq' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='461' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dest' type-id='type-id-196' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='470' column='1'/>
       </data-member>
     </union-decl>
@@ -1429,13 +1429,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__7' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='485' column='1' id='type-id-192'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='opaque_td' type-id='type-id-4' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='486' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='td' type-id='type-id-197' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='487' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='oac_init' type-id='type-id-194' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='488' column='1'/>
       </data-member>
     </union-decl>
@@ -1462,13 +1462,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='491' column='1' id='type-id-193'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='opaque' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='493' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-198' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='494' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-199' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='505' column='1'/>
       </data-member>
     </union-decl>
@@ -1617,10 +1617,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__9' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='615' column='1' id='type-id-205'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='word' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='616' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-206' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='617' column='1'/>
       </data-member>
     </union-decl>
@@ -1642,10 +1642,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__10' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='670' column='1' id='type-id-203'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-207' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='671' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cscn_targ' type-id='type-id-8' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='680' column='1'/>
       </data-member>
     </union-decl>
@@ -1658,10 +1658,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__11' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='684' column='1' id='type-id-204'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cs_thres' type-id='type-id-208' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='685' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__cs_thres' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='687' column='1'/>
       </data-member>
     </union-decl>
@@ -1671,10 +1671,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__12' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='642' column='1' id='type-id-209'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='hword' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='643' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-210' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='644' column='1'/>
       </data-member>
     </union-decl>
@@ -1737,10 +1737,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__13' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='783' column='1' id='type-id-211'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='channel_wq' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='784' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='channel' type-id='type-id-212' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='793' column='1'/>
       </data-member>
     </union-decl>
@@ -1764,31 +1764,31 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__14' size-in-bits='496' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1017' column='1' id='type-id-214'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='initfq' type-id='type-id-215' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1018' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='queryfq' type-id='type-id-216' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1019' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='queryfq_np' type-id='type-id-217' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1020' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='alterfq' type-id='type-id-218' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1021' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='initcgr' type-id='type-id-219' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1022' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cgrtestwrite' type-id='type-id-220' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1023' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querycgr' type-id='type-id-221' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1024' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querycongestion' type-id='type-id-222' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1025' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='querywq' type-id='type-id-223' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1026' column='1'/>
       </data-member>
     </union-decl>
@@ -1990,10 +1990,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='954' column='1' id='type-id-224'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-227' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='955' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_bcnt' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='966' column='1'/>
       </data-member>
     </union-decl>
@@ -2009,10 +2009,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__16' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='968' column='1' id='type-id-225'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-228' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='969' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='a_bcnt' type-id='type-id-80' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='980' column='1'/>
       </data-member>
     </union-decl>
@@ -2028,10 +2028,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__17' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='982' column='1' id='type-id-226'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cscn_targ_swp' type-id='type-id-49' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='983' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__reserved5' type-id='type-id-117' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='984' column='1'/>
       </data-member>
     </union-decl>
@@ -2060,10 +2060,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__18' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='998' column='1' id='type-id-230'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='channel_wq' type-id='type-id-5' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='999' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='channel' type-id='type-id-231' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1008' column='1'/>
       </data-member>
     </union-decl>
@@ -2146,13 +2146,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1203' column='1' id='type-id-241'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dqrr_dpdk_cb' type-id='type-id-244' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1204' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dqrr_dpdk_pull_cb' type-id='type-id-245' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1205' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dqrr' type-id='type-id-246' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/include/fsl_qman.h' line='1206' column='1'/>
       </data-member>
     </union-decl>
@@ -2178,10 +2178,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1008' column='1' id='type-id-253'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='event' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1009' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-255' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1011' column='1'/>
       </data-member>
     </union-decl>
@@ -2215,13 +2215,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1067' column='1' id='type-id-254'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='u64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1068' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='event_ptr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1070' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='mbuf' type-id='type-id-256' visibility='default' filepath='../../dpdk/lib/librte_eventdev/rte_eventdev.h' line='1072' column='1'/>
       </data-member>
     </union-decl>
@@ -2313,20 +2313,20 @@ 
     </class-decl>
     <typedef-decl name='MARKER' type-id='type-id-142' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='414' column='1' id='type-id-258'/>
     <union-decl name='__anonymous_union__22' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='491' column='1' id='type-id-259'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='buf_iova' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='492' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='buf_physaddr' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='493' column='1'/>
       </data-member>
     </union-decl>
     <typedef-decl name='rte_iova_t' type-id='type-id-11' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='335' column='1' id='type-id-268'/>
     <typedef-decl name='MARKER64' type-id='type-id-139' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='420' column='1' id='type-id-260'/>
     <union-decl name='__anonymous_union__23' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='510' column='1' id='type-id-261'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='refcnt_atomic' type-id='type-id-269' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='511' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='refcnt' type-id='type-id-4' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='513' column='1'/>
       </data-member>
     </union-decl>
@@ -2339,10 +2339,10 @@ 
     <typedef-decl name='int16_t' type-id='type-id-272' filepath='/usr/include/bits/stdint-intn.h' line='25' column='1' id='type-id-273'/>
     <typedef-decl name='__int16_t' type-id='type-id-112' filepath='/usr/include/bits/types.h' line='39' column='1' id='type-id-272'/>
     <union-decl name='__anonymous_union__24' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='535' column='1' id='type-id-262'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='packet_type' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='536' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-274' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='537' column='1'/>
       </data-member>
     </union-decl>
@@ -2367,10 +2367,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__25' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='543' column='1' id='type-id-275'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='inner_esp_next_proto' type-id='type-id-14' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='544' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-276' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='550' column='1'/>
       </data-member>
     </union-decl>
@@ -2383,24 +2383,24 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='567' column='1' id='type-id-263'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='hash' type-id='type-id-277' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='597' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='568' column='1' id='type-id-277'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rss' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='569' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='fdir' type-id='type-id-278' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='583' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='sched' type-id='type-id-279' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='584' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='txadapter' type-id='type-id-280' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='594' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='usr' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='596' column='1'/>
       </data-member>
     </union-decl>
@@ -2413,10 +2413,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__28' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='571' column='1' id='type-id-281'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-282' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='572' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='lo' type-id='type-id-7' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='576' column='1'/>
       </data-member>
     </union-decl>
@@ -2454,10 +2454,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='616' column='1' id='type-id-264'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='userdata' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='617' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='udata64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='618' column='1'/>
       </data-member>
     </union-decl>
@@ -2518,10 +2518,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='224' column='1' id='type-id-284'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='pool_data' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='225' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='pool_id' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='226' column='1'/>
       </data-member>
     </union-decl>
@@ -2549,19 +2549,19 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__31' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='55' column='1' id='type-id-291'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='phys_addr' type-id='type-id-293' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='56' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='iova' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='57' column='1'/>
       </data-member>
     </union-decl>
     <typedef-decl name='phys_addr_t' type-id='type-id-11' filepath='../../dpdk/lib/librte_eal/common/include/rte_common.h' line='325' column='1' id='type-id-293'/>
     <union-decl name='__anonymous_union__32' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='60' column='1' id='type-id-292'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='addr' type-id='type-id-59' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='61' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='addr_64' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_memzone.h' line='62' column='1'/>
       </data-member>
     </union-decl>
@@ -2606,10 +2606,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__33' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='140' column='1' id='type-id-300'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='iova' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='141' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='physaddr' type-id='type-id-293' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='142' column='1'/>
       </data-member>
     </union-decl>
@@ -2650,19 +2650,19 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='190' column='1' id='type-id-305'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='iova' type-id='type-id-268' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='191' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='phys_addr' type-id='type-id-293' visibility='default' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='192' column='1'/>
       </data-member>
     </union-decl>
     <typedef-decl name='rte_mempool_memchunk_free_cb_t' type-id='type-id-307' filepath='../../dpdk/lib/librte_mempool/rte_mempool.h' line='176' column='1' id='type-id-308'/>
     <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='626' column='1' id='type-id-266'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='tx_offload' type-id='type-id-11' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='627' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-309' visibility='default' filepath='../../dpdk/lib/librte_mbuf/rte_mbuf_core.h' line='629' column='1'/>
       </data-member>
     </union-decl>
@@ -3339,10 +3339,10 @@ 
       <enumerator name='RTE_DEV_BLACKLISTED' value='1'/>
     </enum-decl>
     <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='57' column='1' id='type-id-433'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='args' type-id='type-id-436' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='59' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='drv_str' type-id='type-id-397' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_devargs.h' line='60' column='1'/>
       </data-member>
     </union-decl>
@@ -3439,10 +3439,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='72' column='1' id='type-id-452'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='eth_dev' type-id='type-id-455' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='73' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='crypto_dev' type-id='type-id-456' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/rte_dpaa_bus.h' line='74' column='1'/>
       </data-member>
     </union-decl>
@@ -3812,13 +3812,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__2' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1069' column='1' id='type-id-478'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='vmdq_dcb_tx_conf' type-id='type-id-489' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1070' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dcb_tx_conf' type-id='type-id-490' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1072' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='vmdq_tx_conf' type-id='type-id-491' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev.h' line='1074' column='1'/>
       </data-member>
     </union-decl>
@@ -4925,10 +4925,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__3' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h' line='71' column='1' id='type-id-683'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='vfio_dev_fd' type-id='type-id-1' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h' line='72' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='uio_cfg_fd' type-id='type-id-1' visibility='default' filepath='../../dpdk/lib/librte_eal/common/include/rte_eal_interrupts.h' line='73' column='1'/>
       </data-member>
     </union-decl>
@@ -4996,10 +4996,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__4' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='760' column='1' id='type-id-692'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rx' type-id='type-id-693' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='761' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='tx' type-id='type-id-694' visibility='default' filepath='../../dpdk/lib/librte_ethdev/rte_ethdev_core.h' line='762' column='1'/>
       </data-member>
     </union-decl>
diff --git a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
index c44ddde9..4f211f2e 100644
--- a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
+++ b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
@@ -685,7 +685,7 @@ 
     <typedef-decl name='size_t' type-id='type-id-4' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-23'/>
     <typedef-decl name='__gthread_mutex_t' type-id='type-id-63' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/gthr-default.h' line='47' column='1' id='type-id-64'/>
     <union-decl name='pthread_mutex_t' size-in-bits='320' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-63'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-65'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-17' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='80' column='1'/>
@@ -710,13 +710,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-65' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-8' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-19' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
     </union-decl>
@@ -748,10 +748,10 @@ 
     <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-73'>
       <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-75'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-13' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-10' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
           </data-member>
         </union-decl>
@@ -2115,50 +2115,55 @@ 
     <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-217'/>
     <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-51'/>
     <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-215'/>
+    <namespace-decl name='std'>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-201'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-220'/>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-34'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-220'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-221'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
+            <parameter type-id='type-id-224'/>
             <parameter type-id='type-id-223'/>
-            <parameter type-id='type-id-222'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
-            <parameter type-id='type-id-224'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-225'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFP14vtkSQLDatabasePKcESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFP14vtkSQLDatabasePKcESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_'>
-            <parameter type-id='type-id-225' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-226' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
-            <parameter type-id='type-id-227' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
+            <parameter type-id='type-id-226' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-227' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
+            <parameter type-id='type-id-228' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
@@ -2168,17 +2173,12 @@ 
     <class-decl name='vtkInformation' visibility='default' is-declaration-only='yes' id='type-id-190'/>
     <class-decl name='vtkInformationVector' visibility='default' is-declaration-only='yes' id='type-id-191'/>
     <class-decl name='vtkObject' visibility='default' is-declaration-only='yes' id='type-id-32'/>
+    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-193'/>
     <class-decl name='vtkTableAlgorithm' visibility='default' is-declaration-only='yes' id='type-id-96'/>
-    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-39'/>
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-42'/>
+    <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-218'/>
+    <reference-type-def kind='lvalue' type-id='type-id-230' size-in-bits='64' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-42'/>
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-212'/>
-    <namespace-decl name='std'>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-201'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-230'/>
-      </class-decl>
-    </namespace-decl>
-    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-193'/>
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-213'/>
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-40'/>
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-36'/>
@@ -2188,7 +2188,7 @@ 
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-48'/>
     <qualified-type-def type-id='type-id-47' const='yes' id='type-id-219'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-226'>
+      <class-decl name='__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-227'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -2207,11 +2207,76 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Vector_base&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const 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-221'>
+        <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-239'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-240'/>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <var-decl name='_M_start' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='64'>
+              <var-decl name='_M_finish' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='128'>
+              <var-decl name='_M_end_of_storage' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
+            </data-member>
+            <member-function access='public' constructor='yes'>
+              <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
+                <parameter type-id='type-id-241' is-artificial='yes'/>
+                <return type-id='type-id-28'/>
+              </function-decl>
+            </member-function>
+            <member-function access='public' constructor='yes'>
+              <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
+                <parameter type-id='type-id-241' is-artificial='yes'/>
+                <parameter type-id='type-id-223'/>
+                <return type-id='type-id-28'/>
+              </function-decl>
+            </member-function>
+          </class-decl>
+        </member-type>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='_M_impl' type-id='type-id-239' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <return type-id='type-id-28'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-223'/>
+            <return type-id='type-id-28'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-4'/>
+            <parameter type-id='type-id-223'/>
+            <return type-id='type-id-28'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' destructor='yes'>
+          <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-17' is-artificial='yes'/>
+            <return type-id='type-id-28'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-220'/>
+    </namespace-decl>
     <class-decl name='vtkInformationObjectBaseKey' visibility='default' is-declaration-only='yes' id='type-id-231'/>
     <class-decl name='vtkSQLDatabaseSchema' size-in-bits='512' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='59' column='1' id='type-id-233'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-32'/>
       <member-type access='private'>
-        <enum-decl name='DatabaseTriggerType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='95' column='1' id='type-id-239'>
+        <enum-decl name='DatabaseTriggerType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='95' column='1' id='type-id-243'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='BEFORE_INSERT' value='0'/>
           <enumerator name='AFTER_INSERT' value='1'/>
@@ -2222,7 +2287,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='VarargTokens' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='337' column='1' id='type-id-240'>
+        <enum-decl name='VarargTokens' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='337' column='1' id='type-id-244'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='COLUMN_TOKEN' value='58'/>
           <enumerator name='INDEX_TOKEN' value='63'/>
@@ -2234,7 +2299,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='DatabaseColumnType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='68' column='1' id='type-id-241'>
+        <enum-decl name='DatabaseColumnType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='68' column='1' id='type-id-245'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='SERIAL' value='0'/>
           <enumerator name='SMALLINT' value='1'/>
@@ -2251,7 +2316,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='DatabaseIndexType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='86' column='1' id='type-id-242'>
+        <enum-decl name='DatabaseIndexType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='86' column='1' id='type-id-246'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='INDEX' value='0'/>
           <enumerator name='UNIQUE' value='1'/>
@@ -2262,7 +2327,7 @@ 
         <var-decl name='Name' type-id='type-id-47' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='383' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='448'>
-        <var-decl name='Internals' type-id='type-id-243' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='385' column='1'/>
+        <var-decl name='Internals' type-id='type-id-247' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='385' column='1'/>
       </data-member>
       <member-function access='protected' constructor='yes'>
         <function-decl name='vtkSQLDatabaseSchema' mangled-name='_ZN20vtkSQLDatabaseSchemaC1Ev' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchemaC1Ev'>
@@ -2273,39 +2338,39 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkSQLDatabaseSchema' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-50' is-artificial='yes'/>
-          <parameter type-id='type-id-244'/>
+          <parameter type-id='type-id-248'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfPreambles' mangled-name='_ZN20vtkSQLDatabaseSchema20GetNumberOfPreamblesEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema20GetNumberOfPreamblesEv'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfTables' mangled-name='_ZN20vtkSQLDatabaseSchema17GetNumberOfTablesEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='754' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema17GetNumberOfTablesEv'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfOptionsInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfOptionsInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfOptionsInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfTriggersInTable' mangled-name='_ZN20vtkSQLDatabaseSchema26GetNumberOfTriggersInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetNumberOfTriggersInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfColumnNamesInIndex' mangled-name='_ZN20vtkSQLDatabaseSchema29GetNumberOfColumnNamesInIndexEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema29GetNumberOfColumnNamesInIndexEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -2313,21 +2378,21 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfIndicesInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfIndicesInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfIndicesInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfColumnsInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfColumnsInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfColumnsInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetOptionBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema26GetOptionBackendFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetOptionBackendFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2335,7 +2400,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetOptionTextFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetOptionTextFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetOptionTextFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2343,7 +2408,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema27GetTriggerBackendFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema27GetTriggerBackendFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2351,7 +2416,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerActionFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema26GetTriggerActionFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetTriggerActionFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2359,7 +2424,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -2367,7 +2432,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2375,7 +2440,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnAttributesFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema29GetColumnAttributesFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='523' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema29GetColumnAttributesFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2383,7 +2448,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnSizeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnSizeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnSizeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -2391,7 +2456,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -2399,7 +2464,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2407,7 +2472,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexColumnNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema28GetIndexColumnNameFromHandleEiii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema28GetIndexColumnNameFromHandleEiii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
           <parameter type-id='type-id-17' name='cnmHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
@@ -2416,7 +2481,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -2424,7 +2489,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -2432,28 +2497,28 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTableNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetTableNameFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetTableNameFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema28GetPreambleBackendFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema28GetPreambleBackendFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleActionFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema27GetPreambleActionFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema27GetPreambleActionFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema25GetPreambleNameFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetPreambleNameFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
@@ -2479,7 +2544,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -2487,7 +2552,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -2495,7 +2560,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='AddTableMultipleArguments' mangled-name='_ZN20vtkSQLDatabaseSchema25AddTableMultipleArgumentsEPKcz' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25AddTableMultipleArgumentsEPKcz'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='679' column='1'/>
           <parameter is-variadic='yes'/>
           <return type-id='type-id-17'/>
@@ -2503,7 +2568,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -2524,7 +2589,7 @@ 
       </member-function>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='GetClassNameInternal' mangled-name='_ZNK20vtkSQLDatabaseSchema20GetClassNameInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-246' is-artificial='yes'/>
+          <parameter type-id='type-id-250' is-artificial='yes'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
@@ -2545,7 +2610,7 @@ 
       </member-function>
       <member-function access='protected' vtable-offset='15'>
         <function-decl name='NewInstanceInternal' mangled-name='_ZNK20vtkSQLDatabaseSchema19NewInstanceInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-246' is-artificial='yes'/>
+          <parameter type-id='type-id-250' is-artificial='yes'/>
           <return type-id='type-id-45'/>
         </function-decl>
       </member-function>
@@ -2678,7 +2743,7 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkSQLQuery' size-in-bits='640' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='66' column='1' id='type-id-234'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-247'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-251'/>
       <data-member access='protected' layout-offset-in-bits='448'>
         <var-decl name='Query' type-id='type-id-47' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='202' column='1'/>
       </data-member>
@@ -2697,20 +2762,20 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkSQLQuery' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
-          <parameter type-id='type-id-248'/>
+          <parameter type-id='type-id-252'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='protected'>
         <function-decl name='SetDatabase' mangled-name='_ZN11vtkSQLQuery11SetDatabaseEP14vtkSQLDatabase' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery11SetDatabaseEP14vtkSQLDatabase'>
-          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-253' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-38' name='_arg' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='46' column='1'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='EscapeString' mangled-name='_ZN11vtkSQLQuery12EscapeStringEPKcb' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery12EscapeStringEPKcb'>
-          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-253' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='src' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1'/>
           <parameter type-id='type-id-1' name='addSurroundingQuotes' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1'/>
           <return type-id='type-id-47'/>
@@ -2725,7 +2790,7 @@ 
       </member-function>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='GetClassNameInternal' mangled-name='_ZNK11vtkSQLQuery20GetClassNameInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-250' is-artificial='yes'/>
+          <parameter type-id='type-id-254' is-artificial='yes'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
@@ -2746,7 +2811,7 @@ 
       </member-function>
       <member-function access='protected' vtable-offset='15'>
         <function-decl name='NewInstanceInternal' mangled-name='_ZNK11vtkSQLQuery19NewInstanceInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-250' is-artificial='yes'/>
+          <parameter type-id='type-id-254' is-artificial='yes'/>
           <return type-id='type-id-45'/>
         </function-decl>
       </member-function>
@@ -2803,7 +2868,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEih' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEih'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-255'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2843,7 +2908,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEis' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEis'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-256'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2867,7 +2932,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiy'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-253'/>
+          <parameter type-id='type-id-257'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2875,7 +2940,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEix'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-258'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2916,7 +2981,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiRK12vtkStdString' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiRK12vtkStdString'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-255'/>
+          <parameter type-id='type-id-259'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2924,7 +2989,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEi10vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEi10vtkVariant'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-256'/>
+          <parameter type-id='type-id-260'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -2952,83 +3017,18 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-257' size-in-bits='64' id='type-id-222'/>
-    <reference-type-def kind='lvalue' type-id='type-id-258' size-in-bits='64' id='type-id-224'/>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-229'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-221'/>
-    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-225'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Vector_base&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const 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-220'>
-        <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-259'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-260'/>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
-            </data-member>
-            <member-function access='public' constructor='yes'>
-              <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-261' is-artificial='yes'/>
-                <return type-id='type-id-28'/>
-              </function-decl>
-            </member-function>
-            <member-function access='public' constructor='yes'>
-              <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-261' is-artificial='yes'/>
-                <parameter type-id='type-id-222'/>
-                <return type-id='type-id-28'/>
-              </function-decl>
-            </member-function>
-          </class-decl>
-        </member-type>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-259' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <return type-id='type-id-28'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
-            <return type-id='type-id-28'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-222'/>
-            <return type-id='type-id-28'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' destructor='yes'>
-          <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-17' is-artificial='yes'/>
-            <return type-id='type-id-28'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-230'/>
-    </namespace-decl>
     <class-decl name='vtkStringArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
-    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-223'/>
-    <qualified-type-def type-id='type-id-223' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-237'/>
+    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-229'/>
+    <reference-type-def kind='lvalue' type-id='type-id-261' size-in-bits='64' id='type-id-223'/>
+    <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-225'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-226'/>
+    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-224'/>
+    <qualified-type-def type-id='type-id-224' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-237'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabase* (*)(const char*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-260'>
+      <class-decl name='allocator&lt;vtkSQLDatabase* (*)(const char*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-240'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-264'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3039,7 +3039,7 @@ 
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-265' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
@@ -3052,7 +3052,7 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-    <class-decl name='vtkRowQuery' size-in-bits='448' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='60' column='1' id='type-id-247'>
+    <class-decl name='vtkRowQuery' size-in-bits='448' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='60' column='1' id='type-id-251'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-32'/>
       <data-member access='protected' layout-offset-in-bits='384'>
         <var-decl name='CaseSensitiveFieldNames' type-id='type-id-1' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='130' column='1'/>
@@ -3160,7 +3160,7 @@ 
         <function-decl name='DataValue' mangled-name='_ZN11vtkRowQuery9DataValueEx' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-266' is-artificial='yes'/>
           <parameter type-id='type-id-271'/>
-          <return type-id='type-id-256'/>
+          <return type-id='type-id-260'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='27'>
@@ -3201,55 +3201,55 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='vtkVariant' size-in-bits='128' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='72' column='1' id='type-id-256'>
+    <class-decl name='vtkVariant' size-in-bits='128' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='72' column='1' id='type-id-260'>
       <member-type access='private'>
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='407' column='1' id='type-id-272'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='String' type-id='type-id-85' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='408' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnicodeString' type-id='type-id-273' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='409' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Float' type-id='type-id-16' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='410' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Double' type-id='type-id-15' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='411' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Char' type-id='type-id-2' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='412' column='1'/>
           </data-member>
-          <data-member access='private'>
-            <var-decl name='UnsignedChar' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='413' column='1'/>
+          <data-member access='public'>
+            <var-decl name='UnsignedChar' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='413' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='SignedChar' type-id='type-id-22' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='414' column='1'/>
           </data-member>
-          <data-member access='private'>
-            <var-decl name='Short' type-id='type-id-252' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='415' column='1'/>
+          <data-member access='public'>
+            <var-decl name='Short' type-id='type-id-256' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='415' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedShort' type-id='type-id-26' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='416' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Int' type-id='type-id-17' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='417' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedInt' type-id='type-id-13' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='418' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Long' type-id='type-id-19' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='419' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedLong' type-id='type-id-4' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='420' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='LongLong' type-id='type-id-20' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='426' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedLongLong' type-id='type-id-21' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='427' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='VTKObject' type-id='type-id-45' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='429' column='1'/>
           </data-member>
         </union-decl>
@@ -3258,10 +3258,10 @@ 
         <var-decl name='Data' type-id='type-id-272' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='430' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='Valid' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='432' column='1'/>
+        <var-decl name='Valid' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='432' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='72'>
-        <var-decl name='Type' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='433' column='1'/>
+        <var-decl name='Type' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='433' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3300,7 +3300,7 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-255'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
@@ -3314,7 +3314,7 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-256'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
@@ -3418,25 +3418,25 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-260' const='yes' id='type-id-257'/>
-    <qualified-type-def type-id='type-id-34' const='yes' id='type-id-258'/>
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-246'/>
-    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-250'/>
-    <reference-type-def kind='lvalue' type-id='type-id-279' size-in-bits='64' id='type-id-255'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-252'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-262'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-261'/>
-    <typedef-decl name='vtkTypeInt64' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-254'/>
-    <typedef-decl name='vtkTypeUInt64' type-id='type-id-21' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='211' column='1' id='type-id-253'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-251'/>
+    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-261'/>
+    <qualified-type-def type-id='type-id-34' const='yes' id='type-id-262'/>
+    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-250'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-279' size-in-bits='64' id='type-id-259'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <typedef-decl name='vtkTypeInt64' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-258'/>
+    <typedef-decl name='vtkTypeUInt64' type-id='type-id-21' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='211' column='1' id='type-id-257'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-255'/>
     <qualified-type-def type-id='type-id-36' const='yes' id='type-id-263'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-236'/>
     <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-238'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-243'/>
-    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-249'/>
+    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-253'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;vtkSQLDatabase* (*)(const char*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-264'>
         <member-function access='private'>
@@ -3478,7 +3478,7 @@ 
       <member-type access='private'>
         <class-decl name='Column' size-in-bits='192' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='46' column='1' id='type-id-285'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-241' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='47' column='1'/>
+            <var-decl name='Type' type-id='type-id-245' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='47' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='Size' type-id='type-id-17' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='48' column='1'/>
@@ -3494,7 +3494,7 @@ 
       <member-type access='private'>
         <class-decl name='Index' size-in-bits='320' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='54' column='1' id='type-id-286'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-242' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='55' column='1'/>
+            <var-decl name='Type' type-id='type-id-246' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='55' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='Name' type-id='type-id-49' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='56' column='1'/>
@@ -3517,7 +3517,7 @@ 
       <member-type access='private'>
         <class-decl name='Trigger' size-in-bits='256' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='61' column='1' id='type-id-289'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-239' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='62' column='1'/>
+            <var-decl name='Type' type-id='type-id-243' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='62' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='Name' type-id='type-id-49' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='63' column='1'/>
@@ -3563,13 +3563,13 @@ 
     <qualified-type-def type-id='type-id-49' const='yes' id='type-id-279'/>
     <reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-276'/>
     <reference-type-def kind='lvalue' type-id='type-id-299' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-265'/>
     <typedef-decl name='vtkIdType' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-266'/>
     <qualified-type-def type-id='type-id-266' const='yes' id='type-id-268'/>
     <qualified-type-def type-id='type-id-236' const='yes' id='type-id-280'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-273'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-274'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-274'/>
     <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-269'/>
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-282'/>
     <namespace-decl name='std'>
@@ -3954,7 +3954,7 @@ 
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-367' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-259'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4067,9 +4067,9 @@ 
     </class-decl>
     <class-decl name='vtkVariantArray' visibility='default' is-declaration-only='yes' id='type-id-301'/>
     <reference-type-def kind='lvalue' type-id='type-id-383' size-in-bits='64' id='type-id-283'/>
-    <qualified-type-def type-id='type-id-247' const='yes' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-297'/>
     <qualified-type-def type-id='type-id-300' const='yes' id='type-id-298'/>
-    <qualified-type-def type-id='type-id-256' const='yes' id='type-id-299'/>
+    <qualified-type-def type-id='type-id-260' const='yes' id='type-id-299'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__normal_iterator&lt;const vtkSQLDatabaseSchemaInternals::Column*, std::vector&lt;vtkSQLDatabaseSchemaInternals::Column, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Column&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-307'>
         <data-member access='protected' layout-offset-in-bits='0'>
@@ -4310,64 +4310,11 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-264' const='yes' id='type-id-383'/>
-    <reference-type-def kind='lvalue' type-id='type-id-415' size-in-bits='64' id='type-id-304'/>
-    <reference-type-def kind='lvalue' type-id='type-id-416' size-in-bits='64' id='type-id-316'/>
-    <reference-type-def kind='lvalue' type-id='type-id-417' size-in-bits='64' id='type-id-328'/>
-    <reference-type-def kind='lvalue' type-id='type-id-418' size-in-bits='64' id='type-id-340'/>
-    <reference-type-def kind='lvalue' type-id='type-id-419' size-in-bits='64' id='type-id-348'/>
-    <reference-type-def kind='lvalue' type-id='type-id-420' size-in-bits='64' id='type-id-356'/>
-    <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-368'/>
-    <reference-type-def kind='lvalue' type-id='type-id-422' size-in-bits='64' id='type-id-306'/>
-    <qualified-type-def type-id='type-id-306' id='type-id-312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-318'/>
-    <qualified-type-def type-id='type-id-318' id='type-id-324'/>
-    <reference-type-def kind='lvalue' type-id='type-id-424' size-in-bits='64' id='type-id-330'/>
-    <qualified-type-def type-id='type-id-330' id='type-id-336'/>
-    <reference-type-def kind='lvalue' type-id='type-id-425' size-in-bits='64' id='type-id-342'/>
-    <reference-type-def kind='lvalue' type-id='type-id-426' size-in-bits='64' id='type-id-350'/>
-    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-358'/>
-    <qualified-type-def type-id='type-id-358' id='type-id-364'/>
-    <reference-type-def kind='lvalue' type-id='type-id-428' size-in-bits='64' id='type-id-369'/>
-    <qualified-type-def type-id='type-id-369' id='type-id-374'/>
-    <reference-type-def kind='lvalue' type-id='type-id-429' size-in-bits='64' id='type-id-305'/>
-    <qualified-type-def type-id='type-id-305' id='type-id-311'/>
-    <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-317'/>
-    <qualified-type-def type-id='type-id-317' id='type-id-323'/>
-    <reference-type-def kind='lvalue' type-id='type-id-431' size-in-bits='64' id='type-id-329'/>
-    <qualified-type-def type-id='type-id-329' id='type-id-335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-432' size-in-bits='64' id='type-id-341'/>
-    <qualified-type-def type-id='type-id-341' id='type-id-345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-349'/>
-    <qualified-type-def type-id='type-id-349' id='type-id-353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-434' size-in-bits='64' id='type-id-357'/>
-    <qualified-type-def type-id='type-id-357' id='type-id-363'/>
-    <qualified-type-def type-id='type-id-255' id='type-id-372'/>
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-382'/>
-    <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-303' const='yes' id='type-id-309'/>
-    <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-315'/>
-    <qualified-type-def type-id='type-id-315' const='yes' id='type-id-321'/>
-    <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-327'/>
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-339'/>
-    <qualified-type-def type-id='type-id-339' const='yes' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-347'/>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-351'/>
-    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-365'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-355'/>
-    <qualified-type-def type-id='type-id-355' const='yes' id='type-id-361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-375'/>
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-367'/>
-    <qualified-type-def type-id='type-id-367' const='yes' id='type-id-370'/>
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Column, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Column&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-302'>
         <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-435'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-436'/>
+          <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-415'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-416'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-308' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4379,13 +4326,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-437' is-artificial='yes'/>
+                <parameter type-id='type-id-417' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-437' is-artificial='yes'/>
+                <parameter type-id='type-id-417' is-artificial='yes'/>
                 <parameter type-id='type-id-304'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4393,24 +4340,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-435' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-415' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-28'/>
@@ -4418,7 +4365,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4428,8 +4375,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Index, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Index&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-314'>
         <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-439'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-440'/>
+          <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-419'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-420'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-320' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4441,13 +4388,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-441' is-artificial='yes'/>
+                <parameter type-id='type-id-421' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-441' is-artificial='yes'/>
+                <parameter type-id='type-id-421' is-artificial='yes'/>
                 <parameter type-id='type-id-316'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4455,24 +4402,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-439' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-419' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-316'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-316'/>
             <return type-id='type-id-28'/>
@@ -4480,7 +4427,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4490,8 +4437,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Option, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Option&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-326'>
         <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-443'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-444'/>
+          <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-423'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-424'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-332' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4503,13 +4450,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-445' is-artificial='yes'/>
+                <parameter type-id='type-id-425' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-445' is-artificial='yes'/>
+                <parameter type-id='type-id-425' is-artificial='yes'/>
                 <parameter type-id='type-id-328'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4517,24 +4464,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-443' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-423' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-328'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-328'/>
             <return type-id='type-id-28'/>
@@ -4542,7 +4489,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4552,8 +4499,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Statement, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&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-338'>
         <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-447'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-448'/>
+          <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-427'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-428'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-405' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4565,13 +4512,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-449' is-artificial='yes'/>
+                <parameter type-id='type-id-429' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-449' is-artificial='yes'/>
+                <parameter type-id='type-id-429' is-artificial='yes'/>
                 <parameter type-id='type-id-340'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4579,24 +4526,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-447' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-427' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-340'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-340'/>
             <return type-id='type-id-28'/>
@@ -4604,7 +4551,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4614,8 +4561,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Table, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Table&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-346'>
         <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-451'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-452'/>
+          <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-431'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-432'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-408' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4627,13 +4574,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-453' is-artificial='yes'/>
+                <parameter type-id='type-id-433' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-453' is-artificial='yes'/>
+                <parameter type-id='type-id-433' is-artificial='yes'/>
                 <parameter type-id='type-id-348'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4641,24 +4588,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-451' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-431' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-348'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-348'/>
             <return type-id='type-id-28'/>
@@ -4666,7 +4613,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4676,8 +4623,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Trigger, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&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-354'>
         <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-455'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-456'/>
+          <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-435'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-436'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-360' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4689,13 +4636,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-457' is-artificial='yes'/>
+                <parameter type-id='type-id-437' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-457' is-artificial='yes'/>
+                <parameter type-id='type-id-437' is-artificial='yes'/>
                 <parameter type-id='type-id-356'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4703,24 +4650,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-455' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-435' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-28'/>
@@ -4728,7 +4675,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -4738,8 +4685,8 @@ 
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;vtkStdString, std::allocator&lt;vtkStdString&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-366'>
         <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-459'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-460'/>
+          <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-439'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-440'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-85' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -4751,13 +4698,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-461' is-artificial='yes'/>
+                <parameter type-id='type-id-441' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-461' is-artificial='yes'/>
+                <parameter type-id='type-id-441' is-artificial='yes'/>
                 <parameter type-id='type-id-368'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -4765,24 +4712,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-459' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-439' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
@@ -4790,13 +4737,66 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-264' const='yes' id='type-id-383'/>
+    <reference-type-def kind='lvalue' type-id='type-id-443' size-in-bits='64' id='type-id-304'/>
+    <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-328'/>
+    <reference-type-def kind='lvalue' type-id='type-id-446' size-in-bits='64' id='type-id-340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-348'/>
+    <reference-type-def kind='lvalue' type-id='type-id-448' size-in-bits='64' id='type-id-356'/>
+    <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-450' size-in-bits='64' id='type-id-306'/>
+    <qualified-type-def type-id='type-id-306' id='type-id-312'/>
+    <reference-type-def kind='lvalue' type-id='type-id-451' size-in-bits='64' id='type-id-318'/>
+    <qualified-type-def type-id='type-id-318' id='type-id-324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-452' size-in-bits='64' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-330' id='type-id-336'/>
+    <reference-type-def kind='lvalue' type-id='type-id-453' size-in-bits='64' id='type-id-342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-454' size-in-bits='64' id='type-id-350'/>
+    <reference-type-def kind='lvalue' type-id='type-id-455' size-in-bits='64' id='type-id-358'/>
+    <qualified-type-def type-id='type-id-358' id='type-id-364'/>
+    <reference-type-def kind='lvalue' type-id='type-id-456' size-in-bits='64' id='type-id-369'/>
+    <qualified-type-def type-id='type-id-369' id='type-id-374'/>
+    <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-305' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-317'/>
+    <qualified-type-def type-id='type-id-317' id='type-id-323'/>
+    <reference-type-def kind='lvalue' type-id='type-id-459' size-in-bits='64' id='type-id-329'/>
+    <qualified-type-def type-id='type-id-329' id='type-id-335'/>
+    <reference-type-def kind='lvalue' type-id='type-id-460' size-in-bits='64' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-341' id='type-id-345'/>
+    <reference-type-def kind='lvalue' type-id='type-id-461' size-in-bits='64' id='type-id-349'/>
+    <qualified-type-def type-id='type-id-349' id='type-id-353'/>
+    <reference-type-def kind='lvalue' type-id='type-id-462' size-in-bits='64' id='type-id-357'/>
+    <qualified-type-def type-id='type-id-357' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-259' id='type-id-372'/>
+    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-382'/>
+    <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-303'/>
+    <qualified-type-def type-id='type-id-303' const='yes' id='type-id-309'/>
+    <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-315'/>
+    <qualified-type-def type-id='type-id-315' const='yes' id='type-id-321'/>
+    <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-327'/>
+    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-339'/>
+    <qualified-type-def type-id='type-id-339' const='yes' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-347'/>
+    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-355'/>
+    <qualified-type-def type-id='type-id-355' const='yes' id='type-id-361'/>
+    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-375'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-367'/>
+    <qualified-type-def type-id='type-id-367' const='yes' id='type-id-370'/>
     <typedef-decl name='vtkUnicodeStringValueType' type-id='type-id-463' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkUnicodeString.h' line='54' column='1' id='type-id-378'/>
     <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-308'/>
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-320'/>
@@ -4816,7 +4816,7 @@ 
     <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-411'/>
     <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-413'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Column&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-436'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Column&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-416'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-464'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4841,7 +4841,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Index&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-440'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Index&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-420'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-466'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4866,7 +4866,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Option&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-444'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Option&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-424'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-468'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4891,7 +4891,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-448'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-428'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-470'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4916,7 +4916,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Table&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-452'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Table&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-432'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-472'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4941,7 +4941,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-456'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-436'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-474'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4966,7 +4966,7 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtkStdString&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-460'>
+      <class-decl name='allocator&lt;vtkStdString&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-440'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-476'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4990,50 +4990,50 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-436' const='yes' id='type-id-415'/>
-    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-416'/>
-    <qualified-type-def type-id='type-id-444' const='yes' id='type-id-417'/>
-    <qualified-type-def type-id='type-id-448' const='yes' id='type-id-418'/>
-    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-419'/>
-    <qualified-type-def type-id='type-id-456' const='yes' id='type-id-420'/>
-    <qualified-type-def type-id='type-id-460' const='yes' id='type-id-421'/>
-    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-422'/>
-    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-423'/>
-    <qualified-type-def type-id='type-id-294' const='yes' id='type-id-424'/>
-    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-425'/>
-    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-426'/>
-    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-427'/>
-    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-428'/>
-    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-429'/>
-    <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-384'/>
+    <qualified-type-def type-id='type-id-416' const='yes' id='type-id-443'/>
+    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-444'/>
+    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-445'/>
+    <qualified-type-def type-id='type-id-428' const='yes' id='type-id-446'/>
+    <qualified-type-def type-id='type-id-432' const='yes' id='type-id-447'/>
+    <qualified-type-def type-id='type-id-436' const='yes' id='type-id-448'/>
+    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-449'/>
+    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-450'/>
+    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-451'/>
+    <qualified-type-def type-id='type-id-294' const='yes' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-453'/>
+    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-454'/>
+    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-384'/>
     <reference-type-def kind='lvalue' type-id='type-id-478' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-286' const='yes' id='type-id-430'/>
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-387'/>
+    <qualified-type-def type-id='type-id-286' const='yes' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-387'/>
     <reference-type-def kind='lvalue' type-id='type-id-479' size-in-bits='64' id='type-id-389'/>
-    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-431'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-390'/>
+    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-390'/>
     <reference-type-def kind='lvalue' type-id='type-id-480' size-in-bits='64' id='type-id-392'/>
-    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-432'/>
-    <qualified-type-def type-id='type-id-290' const='yes' id='type-id-433'/>
-    <qualified-type-def type-id='type-id-289' const='yes' id='type-id-434'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-393'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-460'/>
+    <qualified-type-def type-id='type-id-290' const='yes' id='type-id-461'/>
+    <qualified-type-def type-id='type-id-289' const='yes' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-393'/>
     <reference-type-def kind='lvalue' type-id='type-id-481' size-in-bits='64' id='type-id-395'/>
     <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-396'/>
     <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-438'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-421'/>
+    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-425'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-429'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-433'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-438'/>
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-437'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-442'/>
     <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-441'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-446'/>
-    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-445'/>
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-450'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-449'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-458'/>
-    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-462'/>
-    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-461'/>
     <typedef-decl name='vtkTypeUInt32' type-id='type-id-13' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='196' column='1' id='type-id-463'/>
     <reference-type-def kind='lvalue' type-id='type-id-483' size-in-bits='64' id='type-id-400'/>
     <reference-type-def kind='lvalue' type-id='type-id-484' size-in-bits='64' id='type-id-402'/>
@@ -5217,13 +5217,13 @@ 
     <qualified-type-def type-id='type-id-390' const='yes' id='type-id-480'/>
     <qualified-type-def type-id='type-id-393' const='yes' id='type-id-481'/>
     <qualified-type-def type-id='type-id-396' const='yes' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-471'/>
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-475'/>
-    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-477'/>
     <qualified-type-def type-id='type-id-308' const='yes' id='type-id-483'/>
     <qualified-type-def type-id='type-id-320' const='yes' id='type-id-484'/>
     <qualified-type-def type-id='type-id-332' const='yes' id='type-id-485'/>
@@ -5254,8 +5254,8 @@ 
     <qualified-type-def type-id='type-id-476' const='yes' id='type-id-510'/>
   </abi-instr>
   <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
-    <type-decl name='short int' size-in-bits='16' id='type-id-252'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-251'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-256'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-255'/>
     <class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1' id='type-id-511'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='quot' type-id='type-id-20' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
@@ -5281,7 +5281,7 @@ 
         <var-decl name='rem' type-id='type-id-19' visibility='default' filepath='/usr/include/stdlib.h' line='109' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='vtkRowQuery' size-in-bits='448' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='60' column='1' id='type-id-247'>
+    <class-decl name='vtkRowQuery' size-in-bits='448' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='60' column='1' id='type-id-251'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-32'/>
       <data-member access='protected' layout-offset-in-bits='384'>
         <var-decl name='CaseSensitiveFieldNames' type-id='type-id-1' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='130' column='1'/>
@@ -5389,7 +5389,7 @@ 
         <function-decl name='DataValue' mangled-name='_ZN11vtkRowQuery9DataValueEx' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-266' is-artificial='yes'/>
           <parameter type-id='type-id-271'/>
-          <return type-id='type-id-256'/>
+          <return type-id='type-id-260'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='27'>
@@ -5499,58 +5499,58 @@ 
     <typedef-decl name='vtkUnicodeStringValueType' type-id='type-id-463' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkUnicodeString.h' line='54' column='1' id='type-id-378'/>
     <typedef-decl name='vtkTypeUInt32' type-id='type-id-13' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='196' column='1' id='type-id-463'/>
     <typedef-decl name='vtkTypeUInt16' type-id='type-id-26' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='181' column='1' id='type-id-516'/>
-    <typedef-decl name='vtkTypeInt64' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-254'/>
-    <typedef-decl name='vtkTypeUInt64' type-id='type-id-21' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='211' column='1' id='type-id-253'/>
+    <typedef-decl name='vtkTypeInt64' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='212' column='1' id='type-id-258'/>
+    <typedef-decl name='vtkTypeUInt64' type-id='type-id-21' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='211' column='1' id='type-id-257'/>
     <typedef-decl name='vtkIdType' type-id='type-id-20' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkType.h' line='255' column='1' id='type-id-271'/>
-    <class-decl name='vtkVariant' size-in-bits='128' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='72' column='1' id='type-id-256'>
+    <class-decl name='vtkVariant' size-in-bits='128' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='72' column='1' id='type-id-260'>
       <member-type access='private'>
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='407' column='1' id='type-id-272'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='String' type-id='type-id-85' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='408' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnicodeString' type-id='type-id-273' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='409' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Float' type-id='type-id-16' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='410' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Double' type-id='type-id-15' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='411' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Char' type-id='type-id-2' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='412' column='1'/>
           </data-member>
-          <data-member access='private'>
-            <var-decl name='UnsignedChar' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='413' column='1'/>
+          <data-member access='public'>
+            <var-decl name='UnsignedChar' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='413' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='SignedChar' type-id='type-id-22' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='414' column='1'/>
           </data-member>
-          <data-member access='private'>
-            <var-decl name='Short' type-id='type-id-252' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='415' column='1'/>
+          <data-member access='public'>
+            <var-decl name='Short' type-id='type-id-256' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='415' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedShort' type-id='type-id-26' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='416' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Int' type-id='type-id-17' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='417' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedInt' type-id='type-id-13' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='418' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='Long' type-id='type-id-19' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='419' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedLong' type-id='type-id-4' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='420' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='LongLong' type-id='type-id-20' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='426' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='UnsignedLongLong' type-id='type-id-21' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='427' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='VTKObject' type-id='type-id-45' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='429' column='1'/>
           </data-member>
         </union-decl>
@@ -5559,10 +5559,10 @@ 
         <var-decl name='Data' type-id='type-id-272' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='430' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='Valid' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='432' column='1'/>
+        <var-decl name='Valid' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='432' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='72'>
-        <var-decl name='Type' type-id='type-id-251' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='433' column='1'/>
+        <var-decl name='Type' type-id='type-id-255' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='433' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5601,7 +5601,7 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-255'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
@@ -5615,7 +5615,7 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/Common/Core/vtkVariant.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-256'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
@@ -5734,8 +5734,8 @@ 
     <qualified-type-def type-id='type-id-524' const='yes' id='type-id-525'/>
     <qualified-type-def type-id='type-id-216' const='yes' id='type-id-526'/>
     <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-527'/>
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-229'/>
+    <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-218'/>
     <qualified-type-def type-id='type-id-69' const='yes' id='type-id-528'/>
     <reference-type-def kind='lvalue' type-id='type-id-528' size-in-bits='64' id='type-id-529'/>
     <qualified-type-def type-id='type-id-530' const='yes' id='type-id-531'/>
@@ -5748,7 +5748,7 @@ 
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-539'/>
     <qualified-type-def type-id='type-id-81' const='yes' id='type-id-540'/>
     <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-541'/>
-    <qualified-type-def type-id='type-id-247' const='yes' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-297'/>
     <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-267'/>
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-270'/>
     <qualified-type-def type-id='type-id-516' const='yes' id='type-id-542'/>
@@ -5760,7 +5760,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-546'/>
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-547'/>
     <qualified-type-def type-id='type-id-380' const='yes' id='type-id-382'/>
-    <qualified-type-def type-id='type-id-256' const='yes' id='type-id-299'/>
+    <qualified-type-def type-id='type-id-260' const='yes' id='type-id-299'/>
     <reference-type-def kind='lvalue' type-id='type-id-299' size-in-bits='64' id='type-id-275'/>
     <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-548'/>
     <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-550'/>
@@ -5776,13 +5776,13 @@ 
     <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
     <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-564'/>
     <qualified-type-def type-id='type-id-564' const='yes' id='type-id-565'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-266'/>
     <qualified-type-def type-id='type-id-266' const='yes' id='type-id-268'/>
     <reference-type-def kind='lvalue' type-id='type-id-300' size-in-bits='64' id='type-id-566'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-273'/>
     <reference-type-def kind='lvalue' type-id='type-id-376' size-in-bits='64' id='type-id-567'/>
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-274'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-274'/>
     <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-269'/>
     <namespace-decl name='std'>
       <function-decl name='transform&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;, __gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, int (*)(int)throw ()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='4693' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5983,6 +5983,7 @@ 
       <parameter type-id='type-id-521'/>
       <return type-id='type-id-18'/>
     </function-decl>
+    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-563'/>
     <function-type size-in-bits='64' id='type-id-549'>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-17'/>
@@ -5999,7 +6000,6 @@ 
     <function-type size-in-bits='64' id='type-id-561'>
       <return type-id='type-id-28'/>
     </function-type>
-    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-563'/>
   </abi-instr>
   <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQueryToTable.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
     <class-decl name='vtkRowQueryToTable' size-in-bits='1088' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQueryToTable.h' line='44' column='1' id='type-id-570'>
@@ -6119,9 +6119,9 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-201'/>
       </class-decl>
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-201'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-230'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-220'/>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-230'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-220'/>
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-597'/>
       <function-decl name='__iterator_category&lt;char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-215'/>
@@ -6208,7 +6208,7 @@ 
     <class-decl name='vtkSQLDatabaseSchema' size-in-bits='512' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='59' column='1' id='type-id-233'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-32'/>
       <member-type access='private'>
-        <enum-decl name='DatabaseTriggerType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='95' column='1' id='type-id-239'>
+        <enum-decl name='DatabaseTriggerType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='95' column='1' id='type-id-243'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='BEFORE_INSERT' value='0'/>
           <enumerator name='AFTER_INSERT' value='1'/>
@@ -6219,7 +6219,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='VarargTokens' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='337' column='1' id='type-id-240'>
+        <enum-decl name='VarargTokens' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='337' column='1' id='type-id-244'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='COLUMN_TOKEN' value='58'/>
           <enumerator name='INDEX_TOKEN' value='63'/>
@@ -6231,7 +6231,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='DatabaseColumnType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='68' column='1' id='type-id-241'>
+        <enum-decl name='DatabaseColumnType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='68' column='1' id='type-id-245'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='SERIAL' value='0'/>
           <enumerator name='SMALLINT' value='1'/>
@@ -6248,7 +6248,7 @@ 
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='DatabaseIndexType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='86' column='1' id='type-id-242'>
+        <enum-decl name='DatabaseIndexType' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='86' column='1' id='type-id-246'>
           <underlying-type type-id='type-id-25'/>
           <enumerator name='INDEX' value='0'/>
           <enumerator name='UNIQUE' value='1'/>
@@ -6259,7 +6259,7 @@ 
         <var-decl name='Name' type-id='type-id-47' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='383' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='448'>
-        <var-decl name='Internals' type-id='type-id-243' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='385' column='1'/>
+        <var-decl name='Internals' type-id='type-id-247' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='385' column='1'/>
       </data-member>
       <member-function access='protected' constructor='yes'>
         <function-decl name='vtkSQLDatabaseSchema' mangled-name='_ZN20vtkSQLDatabaseSchemaC1Ev' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchemaC1Ev'>
@@ -6270,39 +6270,39 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkSQLDatabaseSchema' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-50' is-artificial='yes'/>
-          <parameter type-id='type-id-244'/>
+          <parameter type-id='type-id-248'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfPreambles' mangled-name='_ZN20vtkSQLDatabaseSchema20GetNumberOfPreamblesEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema20GetNumberOfPreamblesEv'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfTables' mangled-name='_ZN20vtkSQLDatabaseSchema17GetNumberOfTablesEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='754' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema17GetNumberOfTablesEv'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfOptionsInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfOptionsInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfOptionsInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfTriggersInTable' mangled-name='_ZN20vtkSQLDatabaseSchema26GetNumberOfTriggersInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetNumberOfTriggersInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfColumnNamesInIndex' mangled-name='_ZN20vtkSQLDatabaseSchema29GetNumberOfColumnNamesInIndexEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema29GetNumberOfColumnNamesInIndexEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -6310,21 +6310,21 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfIndicesInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfIndicesInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfIndicesInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetNumberOfColumnsInTable' mangled-name='_ZN20vtkSQLDatabaseSchema25GetNumberOfColumnsInTableEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetNumberOfColumnsInTableEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='814' column='1'/>
           <return type-id='type-id-17'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetOptionBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema26GetOptionBackendFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetOptionBackendFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6332,7 +6332,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetOptionTextFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetOptionTextFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetOptionTextFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6340,7 +6340,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema27GetTriggerBackendFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema27GetTriggerBackendFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6348,7 +6348,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerActionFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema26GetTriggerActionFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema26GetTriggerActionFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6356,7 +6356,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -6364,7 +6364,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6372,7 +6372,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnAttributesFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema29GetColumnAttributesFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='523' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema29GetColumnAttributesFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6380,7 +6380,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnSizeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnSizeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnSizeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -6388,7 +6388,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -6396,7 +6396,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6404,7 +6404,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexColumnNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema28GetIndexColumnNameFromHandleEiii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema28GetIndexColumnNameFromHandleEiii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
           <parameter type-id='type-id-17' name='cnmHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='419' column='1'/>
@@ -6413,7 +6413,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexTypeFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexTypeFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexTypeFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <parameter type-id='type-id-17' name='idxHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='784' column='1'/>
           <return type-id='type-id-17'/>
@@ -6421,7 +6421,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexNameFromHandleEii' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexNameFromHandleEii'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <parameter type-id='type-id-17' name='optHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='661' column='1'/>
           <return type-id='type-id-41'/>
@@ -6429,28 +6429,28 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTableNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema22GetTableNameFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetTableNameFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleBackendFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema28GetPreambleBackendFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema28GetPreambleBackendFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleActionFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema27GetPreambleActionFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema27GetPreambleActionFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='GetPreambleNameFromHandle' mangled-name='_ZN20vtkSQLDatabaseSchema25GetPreambleNameFromHandleEi' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25GetPreambleNameFromHandleEi'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='tblHandle' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='345' column='1'/>
           <return type-id='type-id-41'/>
         </function-decl>
@@ -6476,7 +6476,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetTriggerHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema24GetTriggerHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema24GetTriggerHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -6484,7 +6484,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetColumnHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema23GetColumnHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema23GetColumnHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -6492,7 +6492,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='AddTableMultipleArguments' mangled-name='_ZN20vtkSQLDatabaseSchema25AddTableMultipleArgumentsEPKcz' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema25AddTableMultipleArgumentsEPKcz'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='679' column='1'/>
           <parameter is-variadic='yes'/>
           <return type-id='type-id-17'/>
@@ -6500,7 +6500,7 @@ 
       </member-function>
       <member-function access='private'>
         <function-decl name='GetIndexHandleFromName' mangled-name='_ZN20vtkSQLDatabaseSchema22GetIndexHandleFromNameEPKcS1_' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20vtkSQLDatabaseSchema22GetIndexHandleFromNameEPKcS1_'>
-          <parameter type-id='type-id-245' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='tblName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <parameter type-id='type-id-41' name='trgName' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='543' column='1'/>
           <return type-id='type-id-17'/>
@@ -6521,7 +6521,7 @@ 
       </member-function>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='GetClassNameInternal' mangled-name='_ZNK20vtkSQLDatabaseSchema20GetClassNameInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-246' is-artificial='yes'/>
+          <parameter type-id='type-id-250' is-artificial='yes'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
@@ -6542,7 +6542,7 @@ 
       </member-function>
       <member-function access='protected' vtable-offset='15'>
         <function-decl name='NewInstanceInternal' mangled-name='_ZNK20vtkSQLDatabaseSchema19NewInstanceInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-246' is-artificial='yes'/>
+          <parameter type-id='type-id-250' is-artificial='yes'/>
           <return type-id='type-id-45'/>
         </function-decl>
       </member-function>
@@ -6675,7 +6675,7 @@ 
       </member-function>
     </class-decl>
     <class-decl name='vtkSQLQuery' size-in-bits='640' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='66' column='1' id='type-id-234'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-247'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-251'/>
       <data-member access='protected' layout-offset-in-bits='448'>
         <var-decl name='Query' type-id='type-id-47' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='202' column='1'/>
       </data-member>
@@ -6694,20 +6694,20 @@ 
       <member-function access='private' constructor='yes'>
         <function-decl name='vtkSQLQuery' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
-          <parameter type-id='type-id-248'/>
+          <parameter type-id='type-id-252'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='protected'>
         <function-decl name='SetDatabase' mangled-name='_ZN11vtkSQLQuery11SetDatabaseEP14vtkSQLDatabase' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery11SetDatabaseEP14vtkSQLDatabase'>
-          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-253' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-38' name='_arg' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='46' column='1'/>
           <return type-id='type-id-28'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='EscapeString' mangled-name='_ZN11vtkSQLQuery12EscapeStringEPKcb' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery12EscapeStringEPKcb'>
-          <parameter type-id='type-id-249' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-253' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-41' name='src' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1'/>
           <parameter type-id='type-id-1' name='addSurroundingQuotes' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='81' column='1'/>
           <return type-id='type-id-47'/>
@@ -6722,7 +6722,7 @@ 
       </member-function>
       <member-function access='private' vtable-offset='0'>
         <function-decl name='GetClassNameInternal' mangled-name='_ZNK11vtkSQLQuery20GetClassNameInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-250' is-artificial='yes'/>
+          <parameter type-id='type-id-254' is-artificial='yes'/>
           <return type-id='type-id-41'/>
         </function-decl>
       </member-function>
@@ -6743,7 +6743,7 @@ 
       </member-function>
       <member-function access='protected' vtable-offset='15'>
         <function-decl name='NewInstanceInternal' mangled-name='_ZNK11vtkSQLQuery19NewInstanceInternalEv' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-250' is-artificial='yes'/>
+          <parameter type-id='type-id-254' is-artificial='yes'/>
           <return type-id='type-id-45'/>
         </function-decl>
       </member-function>
@@ -6800,7 +6800,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEih' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEih'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-255'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6840,7 +6840,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEis' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEis'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-256'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6864,7 +6864,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiy'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-253'/>
+          <parameter type-id='type-id-257'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6872,7 +6872,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEix'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-258'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6913,7 +6913,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEiRK12vtkStdString' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEiRK12vtkStdString'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-255'/>
+          <parameter type-id='type-id-259'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6921,7 +6921,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN11vtkSQLQuery13BindParameterEi10vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11vtkSQLQuery13BindParameterEi10vtkVariant'>
           <parameter type-id='type-id-46' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-256'/>
+          <parameter type-id='type-id-260'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -6958,8 +6958,8 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-226' size-in-bits='64' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-237'/>
+    <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-600'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-237'/>
     <qualified-type-def type-id='type-id-237' const='yes' id='type-id-601'/>
     <reference-type-def kind='lvalue' type-id='type-id-371' size-in-bits='64' id='type-id-602'/>
     <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-413'/>
@@ -6969,7 +6969,7 @@ 
     <pointer-type-def type-id='type-id-476' size-in-bits='64' id='type-id-502'/>
     <qualified-type-def type-id='type-id-502' const='yes' id='type-id-605'/>
     <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-51'/>
-    <qualified-type-def type-id='type-id-226' const='yes' id='type-id-606'/>
+    <qualified-type-def type-id='type-id-227' const='yes' id='type-id-606'/>
     <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-607'/>
     <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-608'/>
     <qualified-type-def type-id='type-id-608' const='yes' id='type-id-609'/>
@@ -6987,52 +6987,52 @@ 
     <qualified-type-def type-id='type-id-616' const='yes' id='type-id-617'/>
     <qualified-type-def type-id='type-id-529' id='type-id-618'/>
     <reference-type-def kind='lvalue' type-id='type-id-121' size-in-bits='64' id='type-id-619'/>
-    <qualified-type-def type-id='type-id-220' const='yes' id='type-id-620'/>
+    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-620'/>
     <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-621'/>
     <qualified-type-def type-id='type-id-621' const='yes' id='type-id-622'/>
     <qualified-type-def type-id='type-id-366' const='yes' id='type-id-623'/>
     <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-624'/>
     <qualified-type-def type-id='type-id-624' const='yes' id='type-id-625'/>
-    <qualified-type-def type-id='type-id-260' const='yes' id='type-id-257'/>
-    <reference-type-def kind='lvalue' type-id='type-id-257' size-in-bits='64' id='type-id-222'/>
-    <qualified-type-def type-id='type-id-460' const='yes' id='type-id-421'/>
-    <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-368'/>
-    <qualified-type-def type-id='type-id-34' const='yes' id='type-id-258'/>
-    <reference-type-def kind='lvalue' type-id='type-id-258' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-626'/>
+    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-261'/>
+    <reference-type-def kind='lvalue' type-id='type-id-261' size-in-bits='64' id='type-id-223'/>
+    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-449'/>
+    <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-368'/>
+    <qualified-type-def type-id='type-id-34' const='yes' id='type-id-262'/>
+    <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-626'/>
     <qualified-type-def type-id='type-id-626' const='yes' id='type-id-627'/>
-    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-428'/>
-    <reference-type-def kind='lvalue' type-id='type-id-428' size-in-bits='64' id='type-id-369'/>
-    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-628'/>
+    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-456'/>
+    <reference-type-def kind='lvalue' type-id='type-id-456' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-628'/>
     <qualified-type-def type-id='type-id-628' const='yes' id='type-id-629'/>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-229'/>
-    <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-39'/>
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-230' size-in-bits='64' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-42'/>
     <qualified-type-def type-id='type-id-49' const='yes' id='type-id-279'/>
-    <qualified-type-def type-id='type-id-255' id='type-id-372'/>
-    <reference-type-def kind='lvalue' type-id='type-id-279' size-in-bits='64' id='type-id-255'/>
+    <qualified-type-def type-id='type-id-259' id='type-id-372'/>
+    <reference-type-def kind='lvalue' type-id='type-id-279' size-in-bits='64' id='type-id-259'/>
     <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-396'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-262'/>
-    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-630'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-261'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-462'/>
-    <qualified-type-def type-id='type-id-462' const='yes' id='type-id-631'/>
-    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-260' size-in-bits='64' id='type-id-632'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-265'/>
-    <reference-type-def kind='lvalue' type-id='type-id-460' size-in-bits='64' id='type-id-633'/>
-    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-242'/>
+    <qualified-type-def type-id='type-id-242' const='yes' id='type-id-630'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-442'/>
+    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-631'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-240' size-in-bits='64' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-265'/>
+    <reference-type-def kind='lvalue' type-id='type-id-440' size-in-bits='64' id='type-id-633'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-477'/>
     <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-634'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-221'/>
-    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-226'/>
     <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-375'/>
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-367'/>
     <qualified-type-def type-id='type-id-367' const='yes' id='type-id-370'/>
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-40'/>
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-36'/>
     <qualified-type-def type-id='type-id-36' const='yes' id='type-id-263'/>
-    <qualified-type-def type-id='type-id-223' id='type-id-227'/>
-    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-223'/>
+    <qualified-type-def type-id='type-id-224' id='type-id-228'/>
+    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-224'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-635'/>
     <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-636'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-236'/>
@@ -7058,53 +7058,53 @@ 
     </class-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-34'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-220'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-221'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
+            <parameter type-id='type-id-224'/>
             <parameter type-id='type-id-223'/>
-            <parameter type-id='type-id-222'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
-            <parameter type-id='type-id-224'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
+            <parameter type-id='type-id-225'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-221' is-artificial='yes'/>
+            <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFP14vtkSQLDatabasePKcESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFP14vtkSQLDatabasePKcESaIS5_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_'>
-            <parameter type-id='type-id-225' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-226' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
-            <parameter type-id='type-id-227' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
+            <parameter type-id='type-id-226' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-227' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
+            <parameter type-id='type-id-228' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='296' column='1'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabase* (*)(const char*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-260'>
+      <class-decl name='allocator&lt;vtkSQLDatabase* (*)(const char*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-240'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-264'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7115,7 +7115,7 @@ 
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-265' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
@@ -7127,10 +7127,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const 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-220'>
+      <class-decl name='_Vector_base&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const 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-221'>
         <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-259'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-260'/>
+          <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-239'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-240'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -7142,46 +7142,46 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-261' is-artificial='yes'/>
+                <parameter type-id='type-id-241' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-261' is-artificial='yes'/>
-                <parameter type-id='type-id-222'/>
+                <parameter type-id='type-id-241' is-artificial='yes'/>
+                <parameter type-id='type-id-223'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-259' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-239' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-222'/>
+            <parameter type-id='type-id-223'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-262' is-artificial='yes'/>
+            <parameter type-id='type-id-242' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -7206,7 +7206,7 @@ 
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-367' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-259'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -7558,7 +7558,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkStdString&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-460'>
+      <class-decl name='allocator&lt;vtkStdString&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-440'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-476'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7583,8 +7583,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkStdString, std::allocator&lt;vtkStdString&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-366'>
         <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-459'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-460'/>
+          <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-439'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-440'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-85' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -7596,13 +7596,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-461' is-artificial='yes'/>
+                <parameter type-id='type-id-441' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-461' is-artificial='yes'/>
+                <parameter type-id='type-id-441' is-artificial='yes'/>
                 <parameter type-id='type-id-368'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -7610,24 +7610,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-459' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-439' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-368'/>
             <return type-id='type-id-28'/>
@@ -7635,7 +7635,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -7679,7 +7679,7 @@ 
       </function-decl>
       <function-decl name='_Construct&lt;vtkStdString, vtkStdString&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-85'/>
-        <parameter type-id='type-id-255'/>
+        <parameter type-id='type-id-259'/>
         <return type-id='type-id-28'/>
       </function-decl>
       <function-decl name='_Destroy&lt;vtkStdString*&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'>
@@ -7713,16 +7713,16 @@ 
         <return type-id='type-id-85'/>
       </function-decl>
       <function-decl name='__copy_move_a2&lt;false, __gnu_cxx::__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-226'/>
-        <parameter type-id='type-id-226'/>
-        <parameter type-id='type-id-226'/>
-        <return type-id='type-id-226'/>
+        <parameter type-id='type-id-227'/>
+        <parameter type-id='type-id-227'/>
+        <parameter type-id='type-id-227'/>
+        <return type-id='type-id-227'/>
       </function-decl>
       <function-decl name='copy&lt;__gnu_cxx::__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-226'/>
-        <parameter type-id='type-id-226'/>
-        <parameter type-id='type-id-226'/>
-        <return type-id='type-id-226'/>
+        <parameter type-id='type-id-227'/>
+        <parameter type-id='type-id-227'/>
+        <parameter type-id='type-id-227'/>
+        <return type-id='type-id-227'/>
       </function-decl>
       <function-decl name='__copy_move_a2&lt;false, vtkSQLDatabase* (**)(const char*), vtkSQLDatabase* (**)(const char*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-236'/>
@@ -7791,7 +7791,7 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const vtkStdString*, std::vector&lt;vtkStdString, std::allocator&lt;vtkStdString&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-658'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-226'>
+      <class-decl name='__normal_iterator&lt;vtkSQLDatabase* (**)(const char*), std::vector&lt;vtkSQLDatabase* (*)(const char*), std::allocator&lt;vtkSQLDatabase* (*)(const char*)&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-227'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-236' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -7934,7 +7934,7 @@ 
       <member-type access='private'>
         <class-decl name='Column' size-in-bits='192' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='46' column='1' id='type-id-285'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-241' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='47' column='1'/>
+            <var-decl name='Type' type-id='type-id-245' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='47' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='Size' type-id='type-id-17' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='48' column='1'/>
@@ -7950,7 +7950,7 @@ 
       <member-type access='private'>
         <class-decl name='Index' size-in-bits='320' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='54' column='1' id='type-id-286'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-242' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='55' column='1'/>
+            <var-decl name='Type' type-id='type-id-246' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='55' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='Name' type-id='type-id-49' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='56' column='1'/>
@@ -7973,7 +7973,7 @@ 
       <member-type access='private'>
         <class-decl name='Trigger' size-in-bits='256' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='61' column='1' id='type-id-289'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='Type' type-id='type-id-239' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='62' column='1'/>
+            <var-decl name='Type' type-id='type-id-243' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='62' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='Name' type-id='type-id-49' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='63' column='1'/>
@@ -8141,120 +8141,120 @@ 
     <qualified-type-def type-id='type-id-354' const='yes' id='type-id-757'/>
     <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-758'/>
     <qualified-type-def type-id='type-id-758' const='yes' id='type-id-759'/>
-    <qualified-type-def type-id='type-id-436' const='yes' id='type-id-415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-415' size-in-bits='64' id='type-id-304'/>
-    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-416'/>
-    <reference-type-def kind='lvalue' type-id='type-id-416' size-in-bits='64' id='type-id-316'/>
-    <qualified-type-def type-id='type-id-444' const='yes' id='type-id-417'/>
-    <reference-type-def kind='lvalue' type-id='type-id-417' size-in-bits='64' id='type-id-328'/>
-    <qualified-type-def type-id='type-id-448' const='yes' id='type-id-418'/>
-    <reference-type-def kind='lvalue' type-id='type-id-418' size-in-bits='64' id='type-id-340'/>
-    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-419'/>
-    <reference-type-def kind='lvalue' type-id='type-id-419' size-in-bits='64' id='type-id-348'/>
-    <qualified-type-def type-id='type-id-456' const='yes' id='type-id-420'/>
-    <reference-type-def kind='lvalue' type-id='type-id-420' size-in-bits='64' id='type-id-356'/>
-    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-422'/>
+    <qualified-type-def type-id='type-id-416' const='yes' id='type-id-443'/>
+    <reference-type-def kind='lvalue' type-id='type-id-443' size-in-bits='64' id='type-id-304'/>
+    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-444'/>
+    <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-316'/>
+    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-445'/>
+    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-428' const='yes' id='type-id-446'/>
+    <reference-type-def kind='lvalue' type-id='type-id-446' size-in-bits='64' id='type-id-340'/>
+    <qualified-type-def type-id='type-id-432' const='yes' id='type-id-447'/>
+    <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-348'/>
+    <qualified-type-def type-id='type-id-436' const='yes' id='type-id-448'/>
+    <reference-type-def kind='lvalue' type-id='type-id-448' size-in-bits='64' id='type-id-356'/>
+    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-450'/>
     <qualified-type-def type-id='type-id-306' id='type-id-312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-422' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-760'/>
+    <reference-type-def kind='lvalue' type-id='type-id-450' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-760'/>
     <qualified-type-def type-id='type-id-760' const='yes' id='type-id-761'/>
-    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-423'/>
+    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-451'/>
     <qualified-type-def type-id='type-id-318' id='type-id-324'/>
-    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-451' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-762'/>
     <qualified-type-def type-id='type-id-762' const='yes' id='type-id-763'/>
-    <qualified-type-def type-id='type-id-294' const='yes' id='type-id-424'/>
+    <qualified-type-def type-id='type-id-294' const='yes' id='type-id-452'/>
     <qualified-type-def type-id='type-id-330' id='type-id-336'/>
-    <reference-type-def kind='lvalue' type-id='type-id-424' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-764'/>
+    <reference-type-def kind='lvalue' type-id='type-id-452' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-764'/>
     <qualified-type-def type-id='type-id-764' const='yes' id='type-id-765'/>
-    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-425'/>
-    <reference-type-def kind='lvalue' type-id='type-id-425' size-in-bits='64' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-766'/>
+    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-453'/>
+    <reference-type-def kind='lvalue' type-id='type-id-453' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-766'/>
     <qualified-type-def type-id='type-id-766' const='yes' id='type-id-767'/>
-    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-426'/>
-    <reference-type-def kind='lvalue' type-id='type-id-426' size-in-bits='64' id='type-id-350'/>
-    <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-768'/>
+    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-454'/>
+    <reference-type-def kind='lvalue' type-id='type-id-454' size-in-bits='64' id='type-id-350'/>
+    <pointer-type-def type-id='type-id-454' size-in-bits='64' id='type-id-768'/>
     <qualified-type-def type-id='type-id-768' const='yes' id='type-id-769'/>
-    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-427'/>
+    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-455'/>
     <qualified-type-def type-id='type-id-358' id='type-id-364'/>
-    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-358'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-770'/>
+    <reference-type-def kind='lvalue' type-id='type-id-455' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-770'/>
     <qualified-type-def type-id='type-id-770' const='yes' id='type-id-771'/>
     <qualified-type-def type-id='type-id-369' id='type-id-374'/>
     <qualified-type-def type-id='type-id-233' const='yes' id='type-id-277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-246'/>
-    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-429'/>
+    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-457'/>
     <qualified-type-def type-id='type-id-305' id='type-id-311'/>
-    <reference-type-def kind='lvalue' type-id='type-id-429' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-384'/>
+    <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-384'/>
     <qualified-type-def type-id='type-id-384' const='yes' id='type-id-478'/>
     <reference-type-def kind='lvalue' type-id='type-id-478' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-286' const='yes' id='type-id-430'/>
+    <qualified-type-def type-id='type-id-286' const='yes' id='type-id-458'/>
     <qualified-type-def type-id='type-id-317' id='type-id-323'/>
-    <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-387'/>
+    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-387'/>
     <qualified-type-def type-id='type-id-387' const='yes' id='type-id-479'/>
     <reference-type-def kind='lvalue' type-id='type-id-479' size-in-bits='64' id='type-id-389'/>
-    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-431'/>
+    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-459'/>
     <qualified-type-def type-id='type-id-329' id='type-id-335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-431' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-390'/>
+    <reference-type-def kind='lvalue' type-id='type-id-459' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-390'/>
     <qualified-type-def type-id='type-id-390' const='yes' id='type-id-480'/>
     <reference-type-def kind='lvalue' type-id='type-id-480' size-in-bits='64' id='type-id-392'/>
-    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-432'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-460'/>
     <qualified-type-def type-id='type-id-341' id='type-id-345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-432' size-in-bits='64' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-772'/>
-    <qualified-type-def type-id='type-id-290' const='yes' id='type-id-433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-460' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-772'/>
+    <qualified-type-def type-id='type-id-290' const='yes' id='type-id-461'/>
     <qualified-type-def type-id='type-id-349' id='type-id-353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-773'/>
-    <qualified-type-def type-id='type-id-289' const='yes' id='type-id-434'/>
+    <reference-type-def kind='lvalue' type-id='type-id-461' size-in-bits='64' id='type-id-349'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-289' const='yes' id='type-id-462'/>
     <qualified-type-def type-id='type-id-357' id='type-id-363'/>
-    <reference-type-def kind='lvalue' type-id='type-id-434' size-in-bits='64' id='type-id-357'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-393'/>
+    <reference-type-def kind='lvalue' type-id='type-id-462' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-393'/>
     <qualified-type-def type-id='type-id-393' const='yes' id='type-id-481'/>
     <reference-type-def kind='lvalue' type-id='type-id-481' size-in-bits='64' id='type-id-395'/>
     <qualified-type-def type-id='type-id-396' const='yes' id='type-id-482'/>
     <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-438'/>
-    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-774'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-418' const='yes' id='type-id-774'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-422'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-775'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-421'/>
+    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-426'/>
+    <qualified-type-def type-id='type-id-426' const='yes' id='type-id-776'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-425'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-430'/>
+    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-777'/>
+    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-429'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-434'/>
+    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-778'/>
+    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-433'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-779'/>
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-437'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-442'/>
-    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-775'/>
-    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-441'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-446'/>
-    <qualified-type-def type-id='type-id-446' const='yes' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-445'/>
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-450'/>
-    <qualified-type-def type-id='type-id-450' const='yes' id='type-id-777'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-449'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-454'/>
-    <qualified-type-def type-id='type-id-454' const='yes' id='type-id-778'/>
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-458'/>
-    <qualified-type-def type-id='type-id-458' const='yes' id='type-id-779'/>
-    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-457'/>
     <qualified-type-def type-id='type-id-780' id='type-id-781'/>
-    <reference-type-def kind='lvalue' type-id='type-id-436' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-465'/>
+    <reference-type-def kind='lvalue' type-id='type-id-416' size-in-bits='64' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-465'/>
     <qualified-type-def type-id='type-id-782' id='type-id-783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-440' size-in-bits='64' id='type-id-782'/>
-    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-420' size-in-bits='64' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-467'/>
     <qualified-type-def type-id='type-id-784' id='type-id-785'/>
-    <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-784'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-469'/>
+    <reference-type-def kind='lvalue' type-id='type-id-424' size-in-bits='64' id='type-id-784'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-469'/>
     <qualified-type-def type-id='type-id-786' id='type-id-787'/>
-    <reference-type-def kind='lvalue' type-id='type-id-448' size-in-bits='64' id='type-id-786'/>
-    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-471'/>
+    <reference-type-def kind='lvalue' type-id='type-id-428' size-in-bits='64' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-471'/>
     <qualified-type-def type-id='type-id-788' id='type-id-789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-452' size-in-bits='64' id='type-id-788'/>
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-473'/>
+    <reference-type-def kind='lvalue' type-id='type-id-432' size-in-bits='64' id='type-id-788'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-473'/>
     <qualified-type-def type-id='type-id-790' id='type-id-791'/>
-    <reference-type-def kind='lvalue' type-id='type-id-456' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-475'/>
+    <reference-type-def kind='lvalue' type-id='type-id-436' size-in-bits='64' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-475'/>
     <qualified-type-def type-id='type-id-633' id='type-id-792'/>
     <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-303'/>
@@ -8274,8 +8274,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-365'/>
     <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-355'/>
     <qualified-type-def type-id='type-id-355' const='yes' id='type-id-361'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-243'/>
+    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-247'/>
     <reference-type-def kind='lvalue' type-id='type-id-285' size-in-bits='64' id='type-id-795'/>
     <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-308'/>
     <qualified-type-def type-id='type-id-308' const='yes' id='type-id-483'/>
@@ -8365,7 +8365,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Column&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-436'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Column&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-416'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-464'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8390,8 +8390,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Column, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Column&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-302'>
         <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-435'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-436'/>
+          <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-415'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-416'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-308' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8403,13 +8403,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-437' is-artificial='yes'/>
+                <parameter type-id='type-id-417' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-437' is-artificial='yes'/>
+                <parameter type-id='type-id-417' is-artificial='yes'/>
                 <parameter type-id='type-id-304'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -8417,24 +8417,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-435' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-415' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-28'/>
@@ -8442,7 +8442,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-438' is-artificial='yes'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -8512,7 +8512,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Index&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-440'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Index&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-420'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-466'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8537,8 +8537,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Index, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Index&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-314'>
         <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-439'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-440'/>
+          <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-419'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-420'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-320' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8550,13 +8550,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-441' is-artificial='yes'/>
+                <parameter type-id='type-id-421' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-441' is-artificial='yes'/>
+                <parameter type-id='type-id-421' is-artificial='yes'/>
                 <parameter type-id='type-id-316'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -8564,24 +8564,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-439' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-419' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-316'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-316'/>
             <return type-id='type-id-28'/>
@@ -8589,7 +8589,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-442' is-artificial='yes'/>
+            <parameter type-id='type-id-422' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -8659,7 +8659,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-456'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-436'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-474'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8684,8 +8684,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Trigger, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Trigger&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-354'>
         <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-455'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-456'/>
+          <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-435'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-436'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-360' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8697,13 +8697,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-457' is-artificial='yes'/>
+                <parameter type-id='type-id-437' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-457' is-artificial='yes'/>
+                <parameter type-id='type-id-437' is-artificial='yes'/>
                 <parameter type-id='type-id-356'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -8711,24 +8711,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-455' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-435' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-28'/>
@@ -8736,7 +8736,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-458' is-artificial='yes'/>
+            <parameter type-id='type-id-438' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -8806,7 +8806,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Option&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-444'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Option&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-424'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-468'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8831,8 +8831,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Option, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Option&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-326'>
         <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-443'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-444'/>
+          <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-423'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-424'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-332' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8844,13 +8844,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-445' is-artificial='yes'/>
+                <parameter type-id='type-id-425' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-445' is-artificial='yes'/>
+                <parameter type-id='type-id-425' is-artificial='yes'/>
                 <parameter type-id='type-id-328'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -8858,24 +8858,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-443' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-423' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-328'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-328'/>
             <return type-id='type-id-28'/>
@@ -8883,7 +8883,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-426' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -8936,7 +8936,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-448'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-428'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-470'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8961,8 +8961,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Statement, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Statement&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-338'>
         <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-447'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-448'/>
+          <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-427'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-428'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-405' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8974,13 +8974,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-449' is-artificial='yes'/>
+                <parameter type-id='type-id-429' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-449' is-artificial='yes'/>
+                <parameter type-id='type-id-429' is-artificial='yes'/>
                 <parameter type-id='type-id-340'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -8988,24 +8988,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-447' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-427' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-340'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-340'/>
             <return type-id='type-id-28'/>
@@ -9013,7 +9013,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-430' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -9066,7 +9066,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Table&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-452'>
+      <class-decl name='allocator&lt;vtkSQLDatabaseSchemaInternals::Table&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-432'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-472'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9091,8 +9091,8 @@ 
       </class-decl>
       <class-decl name='_Vector_base&lt;vtkSQLDatabaseSchemaInternals::Table, std::allocator&lt;vtkSQLDatabaseSchemaInternals::Table&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-346'>
         <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-451'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-452'/>
+          <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-431'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-432'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-408' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -9104,13 +9104,13 @@ 
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-453' is-artificial='yes'/>
+                <parameter type-id='type-id-433' is-artificial='yes'/>
                 <return type-id='type-id-28'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-453' is-artificial='yes'/>
+                <parameter type-id='type-id-433' is-artificial='yes'/>
                 <parameter type-id='type-id-348'/>
                 <return type-id='type-id-28'/>
               </function-decl>
@@ -9118,24 +9118,24 @@ 
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-451' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-431' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-348'/>
             <return type-id='type-id-28'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-348'/>
             <return type-id='type-id-28'/>
@@ -9143,7 +9143,7 @@ 
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-454' is-artificial='yes'/>
+            <parameter type-id='type-id-434' is-artificial='yes'/>
             <parameter type-id='type-id-17' is-artificial='yes'/>
             <return type-id='type-id-28'/>
           </function-decl>
@@ -10785,16 +10785,16 @@ 
     <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-877'/>
     <qualified-type-def type-id='type-id-877' const='yes' id='type-id-878'/>
     <class-decl name='vtkEventForwarderCommand' visibility='default' is-declaration-only='yes' id='type-id-868'/>
+    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-869'/>
     <class-decl name='vtkIdTypeArray' visibility='default' is-declaration-only='yes' id='type-id-871'/>
     <class-decl name='vtkTable' visibility='default' is-declaration-only='yes' id='type-id-875'/>
-    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-869'/>
   </abi-instr>
   <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-234' const='yes' id='type-id-278'/>
-    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-250'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-254'/>
     <qualified-type-def type-id='type-id-548' const='yes' id='type-id-879'/>
-    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-249'/>
+    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-253'/>
   </abi-instr>
   <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteDatabase.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
     <class-decl name='vtkSQLiteDatabase' size-in-bits='704' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteDatabase.h' line='55' column='1' id='type-id-880'>
@@ -11068,7 +11068,7 @@ 
         <function-decl name='BindInt64Parameter' mangled-name='_ZN14vtkSQLiteQuery18BindInt64ParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery18BindInt64ParameterEix'>
           <parameter type-id='type-id-896' name='this' is-artificial='yes'/>
           <parameter type-id='type-id-17' name='index' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1'/>
-          <parameter type-id='type-id-254' name='value' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1'/>
+          <parameter type-id='type-id-258' name='value' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='668' column='1'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11150,7 +11150,7 @@ 
         <function-decl name='DataValue' mangled-name='_ZN14vtkSQLiteQuery9DataValueEx' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery9DataValueEx'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-271'/>
-          <return type-id='type-id-256'/>
+          <return type-id='type-id-260'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='27'>
@@ -11194,7 +11194,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEih' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEih'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-255'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11234,7 +11234,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEis' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEis'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-256'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11258,7 +11258,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEiy' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEiy'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-253'/>
+          <parameter type-id='type-id-257'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11266,7 +11266,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEix' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEix'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-258'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11307,7 +11307,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEiRK12vtkStdString' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEiRK12vtkStdString'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-255'/>
+          <parameter type-id='type-id-259'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11315,7 +11315,7 @@ 
         <function-decl name='BindParameter' mangled-name='_ZN14vtkSQLiteQuery13BindParameterEi10vtkVariant' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' line='818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14vtkSQLiteQuery13BindParameterEi10vtkVariant'>
           <parameter type-id='type-id-894' is-artificial='yes'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-256'/>
+          <parameter type-id='type-id-260'/>
           <return type-id='type-id-1'/>
         </function-decl>
       </member-function>
@@ -11342,7 +11342,7 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-898'/>
+    <qualified-type-def type-id='type-id-255' const='yes' id='type-id-898'/>
     <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
     <qualified-type-def type-id='type-id-892' const='yes' id='type-id-900'/>
     <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-895'/>
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 09cbd1ee..447ae42c 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -181,10 +181,10 @@ 
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-23' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-24'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-25'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 33de7221..38e7bbea 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -752,7 +752,7 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h' line='62' column='1' id='type-id-266'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rlock' type-id='type-id-267' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/spinlock_types.h' line='63' column='1'/>
       </data-member>
     </union-decl>
@@ -768,13 +768,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h' line='23' column='1' id='type-id-270'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='val' type-id='type-id-271' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h' line='24' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-272' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h' line='32' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-273' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qspinlock_types.h' line='36' column='1'/>
       </data-member>
     </union-decl>
@@ -1399,10 +1399,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__2' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='923' column='1' id='type-id-360'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='fu_llist' type-id='type-id-371' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='924' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='fu_rcuhead' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='925' column='1'/>
       </data-member>
     </union-decl>
@@ -1500,10 +1500,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='48' column='1' id='type-id-389'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-391' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='49' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='hash_len' type-id='type-id-201' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='52' column='1'/>
       </data-member>
     </union-decl>
@@ -2419,13 +2419,13 @@ 
     <typedef-decl name='s8' type-id='type-id-520' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/int-ll64.h' line='16' column='1' id='type-id-515'/>
     <typedef-decl name='__s8' type-id='type-id-191' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/int-ll64.h' line='20' column='1' id='type-id-520'/>
     <union-decl name='__anonymous_union__4' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h' line='76' column='1' id='type-id-516'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='arg' type-id='type-id-225' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h' line='77' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='str' type-id='type-id-521' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h' line='78' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='arr' type-id='type-id-522' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/moduleparam.h' line='79' column='1'/>
       </data-member>
     </union-decl>
@@ -2968,13 +2968,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__5' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h' line='69' column='1' id='type-id-583'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='uid' type-id='type-id-393' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h' line='70' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='gid' type-id='type-id-155' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h' line='71' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='projid' type-id='type-id-585' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/quota.h' line='72' column='1'/>
       </data-member>
     </union-decl>
@@ -3039,28 +3039,28 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__6' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='78' column='1' id='type-id-590'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-593' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='79' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-594' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='97' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-595' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='104' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-596' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='131' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-597' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='139' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-598' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='144' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-599' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='158' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='callback_head' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='175' column='1'/>
       </data-member>
     </union-decl>
@@ -3289,10 +3289,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__7' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='105' column='1' id='type-id-631'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='slab_list' type-id='type-id-158' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='106' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-634' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='107' column='1'/>
       </data-member>
     </union-decl>
@@ -3308,13 +3308,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='121' column='1' id='type-id-633'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_mem' type-id='type-id-225' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='122' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='counters' type-id='type-id-211' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='123' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-636' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='124' column='1'/>
       </data-member>
     </union-decl>
@@ -3373,10 +3373,10 @@ 
     </class-decl>
     <typedef-decl name='pgtable_t' type-id='type-id-635' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/page.h' line='27' column='1' id='type-id-637'/>
     <union-decl name='__anonymous_union__9' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='148' column='1' id='type-id-638'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='pt_mm' type-id='type-id-639' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='149' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='pt_frag_refcount' type-id='type-id-271' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='150' column='1'/>
       </data-member>
     </union-decl>
@@ -3610,10 +3610,10 @@ 
     </class-decl>
     <typedef-decl name='pteval_t' type-id='type-id-201' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/pgtable-types.h' line='14' column='1' id='type-id-657'/>
     <union-decl name='__anonymous_union__10' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='321' column='1' id='type-id-652'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='shared' type-id='type-id-658' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='325' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='anon_name' type-id='type-id-228' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='326' column='1'/>
       </data-member>
     </union-decl>
@@ -4347,10 +4347,10 @@ 
     </class-decl>
     <typedef-decl name='mm_segment_t' type-id='type-id-211' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h' line='23' column='1' id='type-id-746'/>
     <union-decl name='__anonymous_union__11' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h' line='34' column='1' id='type-id-747'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='preempt_count' type-id='type-id-201' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h' line='35' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='preempt' type-id='type-id-748' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/arch/arm64/include/asm/thread_info.h' line='44' column='1'/>
       </data-member>
     </union-decl>
@@ -4761,10 +4761,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='rcu_special' size-in-bits='32' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h' line='616' column='1' id='type-id-702'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='b' type-id='type-id-773' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h' line='622' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s' type-id='type-id-197' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/sched.h' line='623' column='1'/>
       </data-member>
     </union-decl>
@@ -4832,13 +4832,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__12' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='27' column='1' id='type-id-775'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='futex' type-id='type-id-776' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='36' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='nanosleep' type-id='type-id-777' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='46' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='poll' type-id='type-id-778' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='54' column='1'/>
       </data-member>
     </union-decl>
@@ -4883,10 +4883,10 @@ 
       <enumerator name='TT_COMPAT' value='2'/>
     </enum-decl>
     <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='41' column='1' id='type-id-781'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rmtp' type-id='type-id-782' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='42' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='compat_rmtp' type-id='type-id-783' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/restart_block.h' line='43' column='1'/>
       </data-member>
     </union-decl>
@@ -5202,27 +5202,27 @@ 
     <typedef-decl name='key_serial_t' type-id='type-id-812' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='28' column='1' id='type-id-804'/>
     <typedef-decl name='int32_t' type-id='type-id-260' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/types.h' line='103' column='1' id='type-id-812'/>
     <union-decl name='__anonymous_union__14' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='175' column='1' id='type-id-805'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='graveyard_link' type-id='type-id-158' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='176' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='serial_node' type-id='type-id-184' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='177' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='182' column='1' id='type-id-807'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='expiry' type-id='type-id-443' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='183' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='revoked_at' type-id='type-id-443' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='184' column='1'/>
       </data-member>
     </union-decl>
     <typedef-decl name='key_perm_t' type-id='type-id-446' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='31' column='1' id='type-id-808'/>
     <union-decl name='__anonymous_union__16' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='219' column='1' id='type-id-809'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='index_key' type-id='type-id-813' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='220' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-814' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='221' column='1'/>
       </data-member>
     </union-decl>
@@ -5244,10 +5244,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__17' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='94' column='1' id='type-id-815'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-818' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='95' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='x' type-id='type-id-211' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='104' column='1'/>
       </data-member>
     </union-decl>
@@ -5288,18 +5288,18 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__18' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='234' column='1' id='type-id-810'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='payload' type-id='type-id-820' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='235' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-821' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='236' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='key_payload' size-in-bits='256' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='111' column='1' id='type-id-820'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rcu_data0' type-id='type-id-225' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='112' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='data' type-id='type-id-226' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/key.h' line='113' column='1'/>
       </data-member>
     </union-decl>
@@ -5401,10 +5401,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__19' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h' line='149' column='1' id='type-id-801'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='non_rcu' type-id='type-id-150' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h' line='150' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='rcu' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/cred.h' line='151' column='1'/>
       </data-member>
     </union-decl>
@@ -5806,18 +5806,18 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__20' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='82' column='1' id='type-id-861'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='q_node' type-id='type-id-158' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='83' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__rcu_icq_cache' type-id='type-id-632' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='84' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__21' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='86' column='1' id='type-id-862'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='ioc_node' type-id='type-id-144' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='87' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__rcu_head' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/iocontext.h' line='88' column='1'/>
       </data-member>
     </union-decl>
@@ -5842,25 +5842,25 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__sifields' size-in-bits='256' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='32' column='1' id='type-id-866'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_kill' type-id='type-id-867' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='37' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_timer' type-id='type-id-868' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='45' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_rt' type-id='type-id-869' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='52' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_sigchld' type-id='type-id-870' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='61' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_sigfault' type-id='type-id-871' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='95' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_sigpoll' type-id='type-id-872' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_sigsys' type-id='type-id-873' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='108' column='1'/>
       </data-member>
     </union-decl>
@@ -5889,10 +5889,10 @@ 
     <typedef-decl name='__kernel_timer_t' type-id='type-id-150' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/posix_types.h' line='92' column='1' id='type-id-874'/>
     <typedef-decl name='sigval_t' type-id='type-id-876' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='11' column='1' id='type-id-875'/>
     <union-decl name='sigval' size-in-bits='64' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='8' column='1' id='type-id-876'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='sival_int' type-id='type-id-150' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='9' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='sival_ptr' type-id='type-id-225' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='10' column='1'/>
       </data-member>
     </union-decl>
@@ -5934,13 +5934,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__22' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='77' column='1' id='type-id-878'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_addr_lsb' type-id='type-id-190' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='82' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_addr_bnd' type-id='type-id-879' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='88' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_addr_pkey' type-id='type-id-880' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/uapi/asm-generic/siginfo.h' line='93' column='1'/>
       </data-member>
     </union-decl>
@@ -6028,10 +6028,10 @@ 
       <enumerator name='UTASK_SSTEP_TRAPPED' value='3'/>
     </enum-decl>
     <union-decl name='__anonymous_union__23' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h' line='64' column='1' id='type-id-884'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-887' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h' line='65' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-888' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/uprobes.h' line='70' column='1'/>
       </data-member>
     </union-decl>
@@ -6374,16 +6374,16 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__24' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='178' column='1' id='type-id-591'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='_mapcount' type-id='type-id-271' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='183' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='page_type' type-id='type-id-210' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='191' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='active' type-id='type-id-210' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='193' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='units' type-id='type-id-150' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/mm_types.h' line='194' column='1'/>
       </data-member>
     </union-decl>
@@ -6922,26 +6922,26 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__25' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='650' column='1' id='type-id-396'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_nlink' type-id='type-id-965' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='651' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__i_nlink' type-id='type-id-210' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='652' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__26' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='689' column='1' id='type-id-401'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_dentry' type-id='type-id-142' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='690' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_rcu' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='691' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='700' column='1' id='type-id-403'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_fop' type-id='type-id-362' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='701' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='free_inode' type-id='type-id-562' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='702' column='1'/>
       </data-member>
     </union-decl>
@@ -7152,10 +7152,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__28' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h' line='14' column='1' id='type-id-1005'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='cnts' type-id='type-id-271' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h' line='15' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-1006' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/asm-generic/qrwlock_types.h' line='16' column='1'/>
       </data-member>
     </union-decl>
@@ -7199,13 +7199,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__29' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1093' column='1' id='type-id-999'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='nfs_fl' type-id='type-id-1017' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1094' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='nfs4_fl' type-id='type-id-1018' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1095' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='afs' type-id='type-id-1019' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1100' column='1'/>
       </data-member>
     </union-decl>
@@ -7251,19 +7251,19 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='707' column='1' id='type-id-406'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_pipe' type-id='type-id-739' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='708' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_bdev' type-id='type-id-459' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='709' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_cdev' type-id='type-id-1023' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='710' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_link' type-id='type-id-24' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='711' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i_dir_seq' type-id='type-id-210' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='712' column='1'/>
       </data-member>
     </union-decl>
@@ -7273,10 +7273,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__31' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h' line='26' column='1' id='type-id-1024'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='lock_count' type-id='type-id-7' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h' line='28' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-1025' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/lockref.h' line='30' column='1'/>
       </data-member>
     </union-decl>
@@ -7289,21 +7289,21 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__32' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='107' column='1' id='type-id-384'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='d_lru' type-id='type-id-158' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='108' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='d_wait' type-id='type-id-1026' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='109' column='1'/>
       </data-member>
     </union-decl>
     <union-decl name='__anonymous_union__33' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='116' column='1' id='type-id-385'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='d_alias' type-id='type-id-144' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='117' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='d_in_lookup_hash' type-id='type-id-379' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='118' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='d_rcu' type-id='type-id-372' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/dcache.h' line='119' column='1'/>
       </data-member>
     </union-decl>
@@ -7432,13 +7432,13 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__34' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='150' column='1' id='type-id-1033'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='dir' type-id='type-id-1036' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='151' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='symlink' type-id='type-id-1037' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='152' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='attr' type-id='type-id-1038' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='153' column='1'/>
       </data-member>
     </union-decl>
@@ -7592,10 +7592,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='kernfs_node_id' size-in-bits='64' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='108' column='1' id='type-id-1034'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-1062' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='109' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='id' type-id='type-id-201' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/kernfs.h' line='119' column='1'/>
       </data-member>
     </union-decl>
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 f684a988..c264b547 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
@@ -57,10 +57,10 @@ 
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-28' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-30'>
       <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-31'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
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 e39813a6..1d9fdc38 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -56,10 +56,10 @@ 
     <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'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
index 6bb57df6..35f1ad54 100644
--- a/tests/data/test-read-dwarf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
@@ -12,10 +12,10 @@ 
       </data-member>
     </class-decl>
     <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-1.c' line='2' column='1' id='type-id-5'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-6' visibility='default'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-7' visibility='default'/>
       </data-member>
     </union-decl>
diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
index 86ba8826..4ab5482b 100644
--- a/tests/data/test-read-dwarf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
@@ -7,10 +7,10 @@ 
     <type-decl name='long int' size-in-bits='64' id='type-id-2'/>
     <type-decl name='void' id='type-id-3'/>
     <union-decl name='A' size-in-bits='64' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf/test-PR26568-2.c' line='1' column='1' id='type-id-4'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-5' visibility='default'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-6' visibility='default'/>
       </data-member>
     </union-decl>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 9d09d6c3..5684ccc9 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -6024,7 +6024,7 @@ 
       <class-decl name='ResTable_config' size-in-bits='512' is-struct='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='920' column='1' id='f8926d95'>
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='925' column='1' id='979c7f55'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='926' column='1' id='ce7e2044'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='mcc' type-id='149c6638' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='928' column='1'/>
@@ -6034,17 +6034,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='ce7e2044' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='926' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='imsi' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='932' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='935' column='1' id='abd4b468'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='936' column='1' id='010016f7'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='language' type-id='49f79167' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='959' column='1'/>
@@ -6054,17 +6054,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='010016f7' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='936' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='locale' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='975' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__2' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1005' column='1' id='df403ee6'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1006' column='1' id='d4186a6f'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='orientation' type-id='b96825af' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1007' column='1'/>
@@ -6077,17 +6077,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='d4186a6f' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1006' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='screenType' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1011' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__3' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1045' column='1' id='0b849a65'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1046' column='1' id='8cd38348'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='keyboard' type-id='b96825af' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1047' column='1'/>
@@ -6103,17 +6103,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='8cd38348' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1046' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='input' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1052' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__4' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1063' column='1' id='2d2dbe2e'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1064' column='1' id='7ec6e384'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='screenWidth' type-id='149c6638' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1065' column='1'/>
@@ -6123,17 +6123,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='7ec6e384' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1064' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='screenSize' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1068' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__5' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1079' column='1' id='3a238289'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1080' column='1' id='d4778a30'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='sdkVersion' type-id='149c6638' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1081' column='1'/>
@@ -6143,17 +6143,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='d4778a30' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1080' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='version' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1086' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__6' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1133' column='1' id='43ea82c3'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1134' column='1' id='38083c0a'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='screenLayout' type-id='b96825af' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1135' column='1'/>
@@ -6166,17 +6166,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='38083c0a' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1134' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='screenConfig' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1139' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__7' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1142' column='1' id='b1934262'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1143' column='1' id='677031d4'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='screenWidthDp' type-id='149c6638' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1144' column='1'/>
@@ -6186,17 +6186,17 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='677031d4' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1143' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='screenSizeDp' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1147' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <member-type access='public'>
           <union-decl name='__anonymous_union__8' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1183' column='1' id='d0d77c14'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1184' column='1' id='ffa7ba75'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='screenLayout2' type-id='b96825af' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1185' column='1'/>
@@ -6209,10 +6209,10 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='' type-id='ffa7ba75' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1184' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='screenConfig2' type-id='8f92235e' visibility='default' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1189' column='1'/>
             </data-member>
           </union-decl>
@@ -9943,13 +9943,13 @@ 
             <class-decl name='__rep' size-in-bits='96' is-struct='yes' visibility='default' filepath='external/libcxx/include/string' line='775' column='1' id='ca9cbb0d'>
               <member-type access='public'>
                 <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='external/libcxx/include/string' line='777' column='1' id='8eec8c9d'>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__l' type-id='eb6fbf8c' visibility='default' filepath='external/libcxx/include/string' line='779' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__s' type-id='801f5164' visibility='default' filepath='external/libcxx/include/string' line='780' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__r' type-id='b392097c' visibility='default' filepath='external/libcxx/include/string' line='781' column='1'/>
                   </data-member>
                 </union-decl>
@@ -9979,10 +9979,10 @@ 
             <class-decl name='__short' size-in-bits='96' is-struct='yes' visibility='default' filepath='external/libcxx/include/string' line='754' column='1' id='801f5164'>
               <member-type access='public'>
                 <union-decl name='__anonymous_union__' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='external/libcxx/include/string' line='756' column='1' id='b8d5ba74'>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__size_' type-id='002ac4a6' visibility='default' filepath='external/libcxx/include/string' line='758' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__lx' type-id='1a8dd50d' visibility='default' filepath='external/libcxx/include/string' line='759' column='1'/>
                   </data-member>
                 </union-decl>
@@ -13740,13 +13740,13 @@ 
             <class-decl name='__rep' size-in-bits='96' is-struct='yes' visibility='default' filepath='external/libcxx/include/string' line='775' column='1' id='4da3c689'>
               <member-type access='public'>
                 <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='external/libcxx/include/string' line='777' column='1' id='5305a555'>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__l' type-id='b1d75bc8' visibility='default' filepath='external/libcxx/include/string' line='779' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__s' type-id='6582ed08' visibility='default' filepath='external/libcxx/include/string' line='780' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__r' type-id='5eacdba8' visibility='default' filepath='external/libcxx/include/string' line='781' column='1'/>
                   </data-member>
                 </union-decl>
@@ -13776,10 +13776,10 @@ 
             <class-decl name='__short' size-in-bits='96' is-struct='yes' visibility='default' filepath='external/libcxx/include/string' line='754' column='1' id='6582ed08'>
               <member-type access='public'>
                 <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='external/libcxx/include/string' line='756' column='1' id='087c05a8'>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__size_' type-id='002ac4a6' visibility='default' filepath='external/libcxx/include/string' line='758' column='1'/>
                   </data-member>
-                  <data-member access='private'>
+                  <data-member access='public'>
                     <var-decl name='__lx' type-id='97219ec5' visibility='default' filepath='external/libcxx/include/string' line='759' column='1'/>
                   </data-member>
                 </union-decl>
@@ -19387,69 +19387,69 @@ 
     <class-decl name='ASensorEvent' size-in-bits='832' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='429' column='1' id='38b55796'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='435' column='1' id='3c5aed6e'>
-          <member-type access='private'>
+          <member-type access='public'>
             <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='436' column='1' id='bec64d54'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='data' type-id='73273128' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='437' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='vector' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='438' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='acceleration' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='439' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='magnetic' type-id='48a1b186' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='440' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='temperature' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='441' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='distance' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='442' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='light' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='443' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='pressure' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='444' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='relative_humidity' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='445' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='uncalibrated_gyro' type-id='f1b274b1' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='446' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='uncalibrated_magnetic' type-id='f1b274b1' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='447' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='meta_data' type-id='e3dd54c6' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='448' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='heart_rate' type-id='a4ce2d4d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='449' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='dynamic_sensor_meta' type-id='22cf32ce' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='450' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='additional_info' type-id='1f241bc2' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='451' column='1'/>
               </data-member>
             </union-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='453' column='1' id='0469bf9d'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='data' type-id='c5d13f42' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='454' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='step_counter' type-id='9c313c2d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='455' column='1'/>
               </data-member>
             </union-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='bec64d54' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='436' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='u64' type-id='0469bf9d' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='456' column='1'/>
           </data-member>
         </union-decl>
@@ -19483,7 +19483,7 @@ 
     <class-decl name='ASensorVector' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='367' column='1' id='b6b8bef1'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='368' column='1' id='c1159a44'>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='370' column='1' id='5adeda19'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='371' column='1'/>
@@ -19496,7 +19496,7 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__1' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='375' column='1' id='dbe1315f'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='azimuth' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='376' column='1'/>
@@ -19509,13 +19509,13 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='v' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='369' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='5adeda19' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='370' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='dbe1315f' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='375' column='1'/>
           </data-member>
         </union-decl>
@@ -19534,7 +19534,7 @@ 
     <class-decl name='AUncalibratedEvent' size-in-bits='192' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='390' column='1' id='225d4590'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='391' column='1' id='1dbf3ff8'>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='393' column='1' id='b3670dd6'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='x_uncalib' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='394' column='1'/>
@@ -19547,17 +19547,17 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='uncalib' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='392' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='b3670dd6' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='393' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <union-decl name='__anonymous_union__1' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='399' column='1' id='ac04569c'>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='401' column='1' id='f5acbf13'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='x_bias' type-id='a6c45d85' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='402' column='1'/>
@@ -19570,10 +19570,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='bias' type-id='c723f882' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='400' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='f5acbf13' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='401' column='1'/>
           </data-member>
         </union-decl>
@@ -19616,10 +19616,10 @@ 
     <class-decl name='AAdditionalInfoEvent' size-in-bits='512' is-struct='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='419' column='1' id='fa893a23'>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='422' column='1' id='225a17a3'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='data_int32' type-id='75a6af5f' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='423' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='data_float' type-id='7722ba46' visibility='default' filepath='frameworks/native/include/android/sensor.h' line='424' column='1'/>
           </data-member>
         </union-decl>
@@ -24211,10 +24211,10 @@ 
           <class-decl name='fp32' size-in-bits='32' is-struct='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/half.h' line='69' column='1' id='908282ea'>
             <member-type access='public'>
               <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/half.h' line='70' column='1' id='13344a5e'>
-                <data-member access='private'>
+                <data-member access='public'>
                   <var-decl name='bits' type-id='8f92235e' visibility='default' filepath='frameworks/native/libs/math/include/math/half.h' line='71' column='1'/>
                 </data-member>
-                <data-member access='private'>
+                <data-member access='public'>
                   <var-decl name='fp' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/half.h' line='72' column='1'/>
                 </data-member>
               </union-decl>
@@ -24952,7 +24952,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='9b1fe0f8'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='47' column='1' id='0eea8d94'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='48' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1' id='a51cd681'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
@@ -24965,7 +24965,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__1' size-in-bits='48' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1' id='033c5b5b'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='s' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1'/>
@@ -24978,7 +24978,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__2' size-in-bits='48' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1' id='b8c8bba5'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='r' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1'/>
@@ -24991,22 +24991,22 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='a51cd681' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='033c5b5b' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='b8c8bba5' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xy' type-id='36acd966' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='51' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='st' type-id='36acd966' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='52' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='rg' type-id='36acd966' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='53' column='1'/>
               </data-member>
             </union-decl>
@@ -25065,7 +25065,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='aa8018b3'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='49' column='1' id='4179c018'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1' id='9c8bf3cc'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1'/>
@@ -25075,7 +25075,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1' id='1892c708'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='s' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1'/>
@@ -25085,7 +25085,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__2' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1' id='c81d3630'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='r' type-id='8060d039' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1'/>
@@ -25095,13 +25095,13 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='9c8bf3cc' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='1892c708' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='c81d3630' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1'/>
               </data-member>
             </union-decl>
@@ -25238,7 +25238,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='09bc348c'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='65' column='1' id='7013927e'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='66' column='1' id='e4904b1d'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='66' column='1'/>
@@ -25254,16 +25254,16 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='e4904b1d' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='66' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xyzw' type-id='3702b69c' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='67' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xyz' type-id='97b5500f' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='68' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xy' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/quat.h' line='69' column='1'/>
               </data-member>
             </union-decl>
@@ -25319,7 +25319,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='2a39a2dd'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='47' column='1' id='0de76a12'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='48' column='1' id='e4904b1e'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='48' column='1'/>
@@ -25335,7 +25335,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='49' column='1' id='75a2e4e5'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='s' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='49' column='1'/>
@@ -25351,7 +25351,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='50' column='1' id='94ffa223'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='r' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='50' column='1'/>
@@ -25367,31 +25367,31 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='e4904b1e' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='48' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='75a2e4e5' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='49' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='94ffa223' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='50' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xy' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='51' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='st' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='52' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='rg' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='53' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xyz' type-id='97b5500f' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='54' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='stp' type-id='97b5500f' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='55' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='rgb' type-id='97b5500f' visibility='default' filepath='frameworks/native/libs/math/include/math/vec4.h' line='56' column='1'/>
               </data-member>
             </union-decl>
@@ -25450,7 +25450,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='1b4fbd7f'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='49' column='1' id='4b8a2f10'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1' id='a89c4d88'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1'/>
@@ -25460,7 +25460,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1' id='663d5fa8'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='s' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1'/>
@@ -25470,7 +25470,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__2' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1' id='a9a496cc'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='r' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1'/>
@@ -25480,13 +25480,13 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='a89c4d88' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='50' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='663d5fa8' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='51' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='a9a496cc' visibility='default' filepath='frameworks/native/libs/math/include/math/vec2.h' line='52' column='1'/>
               </data-member>
             </union-decl>
@@ -25545,7 +25545,7 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='b5ca12d8'/>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='47' column='1' id='dd749bdc'>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1' id='5adeda1a'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='x' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
@@ -25558,7 +25558,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__1' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1' id='edac197f'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='s' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1'/>
@@ -25571,7 +25571,7 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <member-type access='private'>
+              <member-type access='public'>
                 <class-decl name='__anonymous_struct__2' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1' id='0e700b4d'>
                   <data-member access='public' layout-offset-in-bits='0'>
                     <var-decl name='r' type-id='a6c45d85' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1'/>
@@ -25584,22 +25584,22 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='5adeda1a' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='48' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='edac197f' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='49' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='' type-id='0e700b4d' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='50' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='xy' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='51' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='st' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='52' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='rg' type-id='adb150ce' visibility='default' filepath='frameworks/native/libs/math/include/math/vec3.h' line='53' column='1'/>
               </data-member>
             </union-decl>
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 c18bb45b..8cd117f7 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -595,10 +595,10 @@ 
     <class-decl name='__anonymous_struct__3' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-50' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-52'>
       <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-53'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-11' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-8' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
@@ -5661,10 +5661,10 @@ 
     <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-657'>
       <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-658'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-11' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-8' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index a3edbd1b..04020d92 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -857,10 +857,10 @@ 
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-80' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-82'>
       <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-83'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-22' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-17' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
@@ -5056,13 +5056,13 @@ 
       <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-2482'>
         <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-2483'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1886' column='1' id='type-id-2484'/>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__data' type-id='type-id-45' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__align' type-id='type-id-2484' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
@@ -6623,13 +6623,13 @@ 
       <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-2641'>
         <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-2642'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1886' column='1' id='type-id-2643'/>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__data' type-id='type-id-42' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__align' type-id='type-id-2643' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
@@ -9134,43 +9134,43 @@ 
         </member-function>
       </class-decl>
       <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1764' column='1' id='type-id-691'>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_unused' type-id='type-id-2856' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1779' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_pod_data' type-id='type-id-9' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1780' column='1'/>
         </data-member>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access' mangled-name='_ZNSt9_Any_data9_M_accessEv' filepath='/usr/include/c++/4.9/functional' line='1766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessEv'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
-        <member-function access='private' const='yes'>
+        <member-function access='public' const='yes'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/usr/include/c++/4.9/functional' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
             <parameter type-id='type-id-696' name='this' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;const std::type_info*&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <return type-id='type-id-1401'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (**)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <return type-id='type-id-245'/>
           </function-decl>
         </member-function>
-        <member-function access='private' const='yes'>
+        <member-function access='public' const='yes'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v' filepath='/usr/include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v'>
             <parameter type-id='type-id-696' name='this' is-artificial='yes'/>
             <return type-id='type-id-237'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <return type-id='type-id-240'/>
@@ -9178,16 +9178,16 @@ 
         </member-function>
       </union-decl>
       <union-decl name='_Nocopy_types' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1756' column='1' id='type-id-2856'>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_object' type-id='type-id-23' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1758' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_const_object' type-id='type-id-23' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_function_pointer' type-id='type-id-2278' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_member_pointer' type-id='type-id-24' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761' column='1'/>
         </data-member>
       </union-decl>
@@ -15356,22 +15356,22 @@ 
         <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-619'>
           <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-3197'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_boolVal' type-id='type-id-1' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='141' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_doubleVal' type-id='type-id-27' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='142' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_intVal' type-id='type-id-29' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='143' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_longVal' type-id='type-id-26' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='144' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_unsignedLongLongVal' type-id='type-id-34' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='145' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_unsignedVal' type-id='type-id-22' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='146' column='1'/>
               </data-member>
             </union-decl>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 9558588a..43631848 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1844,7 +1844,7 @@ 
     <typedef-decl name='__gthread_mutex_t' type-id='type-id-74' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='50' column='1' id='type-id-75'/>
     <typedef-decl name='pthread_mutex_t' type-id='type-id-76' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='128' column='1' id='type-id-74'/>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='90' column='1' id='type-id-76'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='92' column='1' id='type-id-77'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-43' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='94' column='1'/>
@@ -1872,13 +1872,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-77' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='125' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-19' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='126' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-45' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='127' column='1'/>
       </data-member>
     </union-decl>
@@ -1894,7 +1894,7 @@ 
     <typedef-decl name='__gthread_cond_t' type-id='type-id-81' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='52' column='1' id='type-id-82'/>
     <typedef-decl name='pthread_cond_t' type-id='type-id-83' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='154' column='1' id='type-id-81'/>
     <union-decl name='__anonymous_union__1' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='139' column='1' id='type-id-83'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='141' column='1' id='type-id-84'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-43' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='143' column='1'/>
@@ -1922,13 +1922,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-84' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='151' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-21' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='152' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-46' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='153' column='1'/>
       </data-member>
     </union-decl>
@@ -1944,10 +1944,10 @@ 
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-97'>
       <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-98'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-30' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-23' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
@@ -8063,145 +8063,145 @@ 
         </member-function>
       </class-decl>
       <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1764' column='1' id='type-id-486'>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_unused' type-id='type-id-2992' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1779' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_pod_data' type-id='type-id-11' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1780' column='1'/>
         </data-member>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;const std::type_info *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1386'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-31'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access' mangled-name='_ZNSt9_Any_data9_M_accessEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessEv'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-31'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1715'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1714'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1709'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1708'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1727'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1726'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1745'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1744'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1751'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1750'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1739'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1738'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1721'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1720'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-1757'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-1756'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-2993'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-2994'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERT_v'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
             <return type-id='type-id-2995'/>
           </function-decl>
         </member-function>
-        <member-function access='private'>
+        <member-function access='public'>
           <function-decl name='_M_access&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;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERKT_v'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <return type-id='type-id-2996'/>
@@ -8321,13 +8321,13 @@ 
       </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-2785'/>
       <union-decl name='_Nocopy_types' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1756' column='1' id='type-id-2992'>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_object' type-id='type-id-31' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1758' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_const_object' type-id='type-id-31' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
-        <data-member access='private'>
+        <data-member access='public'>
           <var-decl name='_M_function_pointer' type-id='type-id-2726' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1760' column='1'/>
         </data-member>
       </union-decl>
@@ -14972,13 +14972,13 @@ 
       <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-3295'>
         <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-3296'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1' id='type-id-3297'/>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__data' type-id='type-id-55' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__align' type-id='type-id-3297' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
@@ -15269,13 +15269,13 @@ 
       <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-3336'>
         <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-3337'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1' id='type-id-3338'/>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__data' type-id='type-id-53' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__align' type-id='type-id-3338' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
@@ -15716,13 +15716,13 @@ 
       <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-3406'>
         <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-3407'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1' id='type-id-3408'/>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__data' type-id='type-id-52' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='__align' type-id='type-id-3408' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
@@ -21073,10 +21073,10 @@ 
         <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-181'>
           <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-3589'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='data' type-id='type-id-11' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='aligner_' type-id='type-id-3564' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
@@ -21100,10 +21100,10 @@ 
         <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-183'>
           <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-3590'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='data' type-id='type-id-11' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='aligner_' type-id='type-id-3564' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
@@ -21322,10 +21322,10 @@ 
         <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-179'>
           <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-3601'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='data' type-id='type-id-19' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='aligner_' type-id='type-id-3564' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index 39ac2d40..bafd6d33 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -2049,10 +2049,10 @@ 
     <typedef-decl name='DBusServer' type-id='type-id-163' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h' line='42' column='1' id='type-id-170'/>
     <typedef-decl name='DBusGUID' type-id='type-id-171' filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-165'/>
     <union-decl name='DBusGUID' size-in-bits='128' visibility='default' filepath='../dbus/dbus-internals.h' line='351' column='1' id='type-id-171'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='as_uint32s' type-id='type-id-161' visibility='default' filepath='../dbus/dbus-internals.h' line='352' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='as_bytes' type-id='type-id-159' visibility='default' filepath='../dbus/dbus-internals.h' line='353' column='1'/>
       </data-member>
     </union-decl>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index d0c9dae2..c16e2eb3 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -2047,10 +2047,10 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='o_pwlcurve' type-id='type-id-99' visibility='default' filepath='libnurbs/internals/reader.h' line='58' column='1'/>
           </data-member>
         </union-decl>
@@ -5495,10 +5495,10 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='o_pwlcurve' type-id='type-id-99' visibility='default' filepath='libnurbs/internals/reader.h' line='58' column='1'/>
           </data-member>
         </union-decl>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index debe31cc..01ac199c 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1980,40 +1980,40 @@ 
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='75'/>
     </enum-decl>
     <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='458' column='1' id='type-id-61'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_name' type-id='type-id-63' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='467' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_operator' type-id='type-id-64' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='474' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_extended_operator' type-id='type-id-65' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='483' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_fixed' type-id='type-id-66' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='494' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_ctor' type-id='type-id-67' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='503' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_dtor' type-id='type-id-68' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='512' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_builtin' type-id='type-id-69' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='519' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_string' type-id='type-id-70' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='528' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_number' type-id='type-id-71' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='535' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_character' type-id='type-id-72' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='541' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_binary' type-id='type-id-73' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='550' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='s_unary_num' type-id='type-id-74' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='558' column='1'/>
       </data-member>
     </union-decl>
@@ -3291,10 +3291,10 @@ 
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-253' visibility='default' filepath='/usr/include/elf.h' line='643' column='1' id='type-id-252'>
       <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-254'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='d_val' type-id='type-id-255' visibility='default' filepath='/usr/include/elf.h' line='647' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='d_ptr' type-id='type-id-249' visibility='default' filepath='/usr/include/elf.h' line='648' column='1'/>
           </data-member>
         </union-decl>
@@ -3343,10 +3343,10 @@ 
       <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-264'>
         <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-280'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='sigaction' type-id='type-id-276' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='425' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='handler' type-id='type-id-281' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='426' column='1'/>
             </data-member>
           </union-decl>
@@ -3625,10 +3625,10 @@ 
     <typedef-decl name='_Unwind_Ptr' type-id='type-id-33' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='53' column='1' id='type-id-300'/>
     <typedef-decl name='pthread_attr_t' type-id='type-id-301' filepath='/usr/include/bits/pthreadtypes.h' line='57' column='1' id='type-id-302'/>
     <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='54' column='1' id='type-id-301'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-296' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='55' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='56' column='1'/>
       </data-member>
     </union-decl>
@@ -7301,10 +7301,10 @@ 
     <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-633'>
       <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-634'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='sa_handler' type-id='type-id-635' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='93' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='sa_sigaction' type-id='type-id-636' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='94' column='1'/>
           </data-member>
         </union-decl>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 3002abd0..09acf426 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -2798,7 +2798,7 @@ 
     <typedef-decl name='__pid_t' type-id='type-id-25' filepath='/usr/include/bits/types.h' line='133' column='1' id='type-id-236'/>
     <typedef-decl name='AutoSet' type-id='type-id-237' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='259' column='1' id='type-id-238'/>
     <union-decl name='varDescFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='217' column='1' id='type-id-239'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='218' column='1' id='type-id-240'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='is_static' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='220' column='1'/>
@@ -2844,10 +2844,10 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='' type-id='type-id-240' visibility='default'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='bits' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='250' column='1'/>
       </data-member>
     </union-decl>
@@ -3734,7 +3734,7 @@ 
     <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-286'>
       <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-287'>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='257' column='1' id='type-id-288'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='dst' type-id='type-id-20' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='258' column='1'/>
@@ -3744,17 +3744,17 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='type-id-288' visibility='default'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='bits' type-id='type-id-20' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='261' column='1'/>
           </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-289'>
-          <member-type access='private'>
+          <member-type access='public'>
             <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='266' column='1' id='type-id-290'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='in' type-id='type-id-20' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='267' column='1'/>
@@ -3764,30 +3764,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='' type-id='type-id-290' visibility='default'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='bits' type-id='type-id-20' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='270' column='1'/>
           </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-291'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='count' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='291' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='disp' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='293' column='1'/>
           </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-292'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='alloc' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='299' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='ptr_arr_offset' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='300' column='1'/>
           </data-member>
         </union-decl>
@@ -3841,7 +3841,7 @@ 
       </data-member>
     </class-decl>
     <union-decl name='OffloadFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='160' column='1' id='type-id-276'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='162' column='1' id='type-id-294'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='fortran_traceback' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='163' column='1'/>
@@ -3851,7 +3851,7 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='162' column='1' id='type-id-294'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='fortran_traceback' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='163' column='1'/>
@@ -3861,10 +3861,10 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='flags' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='161' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='bits' type-id='type-id-294' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='165' column='1'/>
       </data-member>
     </union-decl>
@@ -12011,7 +12011,7 @@ 
     <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2059'/>
     <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2060'/>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='91' column='1' id='type-id-2061'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='92' column='1' id='type-id-2076'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='94' column='1'/>
@@ -12039,13 +12039,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-2076' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='124' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-2079' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='125' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-191' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
       </data-member>
     </union-decl>
@@ -18497,7 +18497,7 @@ 
     </class-decl>
     <typedef-decl name='pthread_mutex_t' type-id='type-id-2061' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-1967'/>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='91' column='1' id='type-id-2061'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='92' column='1' id='type-id-2076'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-25' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='94' column='1'/>
@@ -18525,13 +18525,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-2076' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='124' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-2079' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='125' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-191' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
       </data-member>
     </union-decl>
@@ -19525,10 +19525,10 @@ 
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-3552' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-3554'>
       <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-3555'>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wch' type-id='type-id-2' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
-          <data-member access='private'>
+          <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-3534' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
           </data-member>
         </union-decl>
@@ -19969,10 +19969,10 @@ 
           </member-type>
           <member-type access='private'>
             <union-decl name='__anonymous_union__' 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-3674'>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_M_local_buf' type-id='type-id-3531' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='122' column='1'/>
               </data-member>
-              <data-member access='private'>
+              <data-member access='public'>
                 <var-decl name='_M_allocated_capacity' type-id='type-id-3610' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='123' column='1'/>
               </data-member>
             </union-decl>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 68df65c5..8ad6b003 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -293,7 +293,7 @@ 
     <typedef-decl name='hb_destroy_func_t' type-id='type-id-20' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='339' column='1' id='type-id-21'/>
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-23'/>
     <union-decl name='pthread_mutex_t' size-in-bits='320' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-22'>
-      <member-type access='private'>
+      <member-type access='public'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-24'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-9' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='80' column='1'/>
@@ -318,13 +318,13 @@ 
           </data-member>
         </class-decl>
       </member-type>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__data' type-id='type-id-24' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__size' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='102' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='__align' type-id='type-id-10' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
     </union-decl>
@@ -1062,22 +1062,22 @@ 
     <typedef-decl name='hb_mask_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-133'/>
     <typedef-decl name='hb_var_int_t' type-id='type-id-136' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-134'/>
     <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-136'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='u32' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i32' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='u16' type-id='type-id-83' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i16' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='u8' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='i8' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
       </data-member>
     </union-decl>
@@ -4121,7 +4121,7 @@ 
       <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-299'>
         <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-612'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='184' column='1' id='type-id-613'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='ttcTag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='185' column='1'/>
@@ -4131,10 +4131,10 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='header' type-id='type-id-613' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='188' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='version1' type-id='type-id-302' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='189' column='1'/>
             </data-member>
           </union-decl>
@@ -4154,13 +4154,13 @@ 
       <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-294'>
         <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-617'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='251' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='fontFace' type-id='type-id-369' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='252' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='ttcHeader' type-id='type-id-299' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='253' column='1'/>
             </data-member>
           </union-decl>
@@ -4616,10 +4616,10 @@ 
           <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-795'>
             <member-type access='private'>
               <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-796'>
-                <data-member access='private'>
+                <data-member access='public'>
                   <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
-                <data-member access='private'>
+                <data-member access='public'>
                   <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
@@ -4640,13 +4640,13 @@ 
         </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-800'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-623' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='922' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format2' type-id='type-id-624' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='923' column='1'/>
             </data-member>
           </union-decl>
@@ -5434,38 +5434,38 @@ 
         </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-829'>
-            <member-type access='private'>
+            <member-type access='public'>
               <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='sub_format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
@@ -5628,10 +5628,10 @@ 
       <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-833'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-918'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
@@ -6642,10 +6642,10 @@ 
       <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-834'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-965'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-628' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='911' column='1'/>
             </data-member>
           </union-decl>
@@ -6794,10 +6794,10 @@ 
       <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-832'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-967'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
@@ -7009,10 +7009,10 @@ 
       <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-838'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-977'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
@@ -7102,13 +7102,13 @@ 
       <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-831'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-980'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-669' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='246' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format2' type-id='type-id-670' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='247' column='1'/>
             </data-member>
           </union-decl>
@@ -7433,16 +7433,16 @@ 
       <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-958'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1011'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
@@ -7477,16 +7477,16 @@ 
       <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-962'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1016'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
@@ -7521,10 +7521,10 @@ 
       <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-963'>
         <member-type access='protected'>
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1020'>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
-            <data-member access='private'>
+            <data-member access='public'>
               <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
@@ -9900,10 +9900,10 @@ 
     </class-decl>
     <typedef-decl name='FT_StreamDesc' type-id='type-id-1195' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-1192'/>
     <union-decl name='FT_StreamDesc_' size-in-bits='64' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='210' column='1' id='type-id-1195'>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='value' type-id='type-id-10' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='211' column='1'/>
       </data-member>
-      <data-member access='private'>
+      <data-member access='public'>
         <var-decl name='pointer' type-id='type-id-33' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='212' column='1'/>
       </data-member>
     </union-decl>
@@ -10700,28 +10700,28 @@ 
       <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-1238'>
         <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